Merge remote-tracking branch 'remotes/origin/AD-479-piece-registration-in-new-fronten' into AD-416-account-settings-page-navbar

Conflicts:
	js/routes.js

gulpfile.js

@@ -49,7 +49,7 @@ var config = {
     filesToWatch: [
         'build/css/*.css',
         'build/js/*.js',
-        'node_modules/react-s3-fineuploader/*.js'
+        'node_modules/react-s3-fine_uploader/*.js'
     ]
 };
 
@@ -69,7 +69,7 @@ gulp.task('js:build', function() {
     bundle(false);
 });
 
-gulp.task('serve', ['browser-sync', 'run-server', 'sass:build', 'sass:watch', 'copy'], function() {
+gulp.task('serve', ['browser-sync', 'run-server', 'sass:watch', 'copy'], function() {
     bundle(true);
 });
 

index.html

@@ -11,6 +11,7 @@
         <script>
             window.BASE_URL = '<%= BASE_URL %>';
             window.API_ENDPOINT = '<%= API_ENDPOINT %>';
+            window.SERVER_URL = '<%= SERVER_URL %>';
             <% DEBUG && print('window.DEBUG = true'); %>
             <% DEBUG && print('window.CREDENTIALS = \'' + CREDENTIALS + '\''); %>
         </script>

js/components/register_piece.js

@@ -9,8 +9,9 @@ import ReactS3FineUploader from 'ReactS3FineUploader';
 
 let RegisterPiece = React.createClass( {
     render() {
-
+        console.log(AppConstants.serverUrl)
         return (
+
             <div>
                 <ReactS3FineUploader
                     keyRoutine={{

node_modules/react-s3-fineuploader

@@ -1 +1 @@
-Subproject commit 2161e28e1bf5f69719c8b376ecb24fd3334806ba
+Subproject commit e2890cf3d28d010abc04e0de3b218afe8c949596

package.json

@@ -27,7 +27,6 @@
           "compact": false
         }
       ],
-      "reactify",
       "browserify-shim"
     ]
   },