diff --git a/bower.json b/bower.json
index 84f34777..dd22b494 100755
--- a/bower.json
+++ b/bower.json
@@ -33,7 +33,7 @@
     "angular-input-stars": "https://github.com/whitef0x0/angular-input-stars.git#master",
     "raven-js": "^3.0.4",
     "tableExport.jquery.plugin": "^1.5.1",
-    "angular-translate": "~2.11.0"
+    "angular-translate": "~2.11.0",
     "js-yaml": "^3.6.1",
     "angular-ui-select": "whitef0x0/ui-select#compiled"
   },
diff --git a/config/config.js b/config/config.js
index a9e3db74..47caf459 100755
--- a/config/config.js
+++ b/config/config.js
@@ -12,7 +12,6 @@ var _ = require('lodash'),
 var exists = require('path-exists').sync;
 
 var minBowerFiles = function(type){
-	console.log(type);
     return bowerFiles(type).map( function(path, index, arr) {
       var newPath = path.replace(/.([^.]+)$/g, '.min.$1');
       return exists( newPath ) ? newPath : path;
diff --git a/config/env/all.js b/config/env/all.js
index ac23abbc..53be7383 100755
--- a/config/env/all.js
+++ b/config/env/all.js
@@ -72,9 +72,9 @@ module.exports = {
 	assets: {
 		css: [
 			'public/modules/**/css/*.css',
-			'public/modules/**/demo/**/*.css',
-			'public/modules/**/dist/**/*.css',
-			'public/modules/**/node_modules/**/*.css'
+			'!public/modules/**/demo/**/*.css',
+			'!public/modules/**/dist/**/*.css',
+			'!public/modules/**/node_modules/**/*.css'
 		],
 		js: [
 			'public/dist/populate_template_cache.js',
@@ -83,10 +83,19 @@ module.exports = {
 			'public/*.js',
 			'public/modules/*/*.js',
 			'public/modules/*/*/*.js',
-			'public/modules/**/*.js'
+			'public/modules/*/*/*/*.js',
+			'!public/modules/**/gruntfile.js',
+			'!public/modules/**/demo/**/*.js',
+			'!public/modules/**/dist/**/*.js',
+			'!public/modules/**/node_modules/**/*.js',
+			'!public/modules/**/tests/**/*.js'
 		],
 		views: [
-			'public/modules/**/*.html'
+			'public/modules/**/*.html',
+			'!public/modules/**/demo/**/*.html',
+			'!public/modules/**/dist/**/*.html',
+			'!public/modules/**/node_modules/**/*.html',
+			'!public/modules/**/tests/**/*.html'
 		],
 		unit_tests: [
 			'public/lib/angular-mocks/angular-mocks.js',
diff --git a/public/modules/forms/base/directives/field.client.directive.js b/public/modules/forms/base/directives/field.client.directive.js
index 6bda96ee..b02eb1ce 100644
--- a/public/modules/forms/base/directives/field.client.directive.js
+++ b/public/modules/forms/base/directives/field.client.directive.js
@@ -99,6 +99,7 @@ angular.module('forms').directive('fieldDirective', ['$http', '$compile', '$root
 				fieldType = 'textfield';
 			}
             var template = getTemplateUrl(fieldType);
+			console.log(template);
            	element.html(template).show();
             var output = $compile(element.contents())(scope);
         }
diff --git a/public/modules/forms/base/directives/submit-form.client.directive.js b/public/modules/forms/base/directives/submit-form.client.directive.js
index 0184fd23..243a88dd 100644
--- a/public/modules/forms/base/directives/submit-form.client.directive.js
+++ b/public/modules/forms/base/directives/submit-form.client.directive.js
@@ -4,7 +4,8 @@
 angular.module('forms').directive('submitFormDirective', ['$http', 'TimeCounter', '$filter', '$rootScope', 'Auth', 'SendVisitorData',
     function ($http, TimeCounter, $filter, $rootScope, Auth, SendVisitorData) {
         return {
-            templateUrl: 'modules/forms/base/views/directiveViews/form/submit-form.client.view.html',                restrict: 'E',
+            templateUrl: 'modules/forms/base/views/directiveViews/form/submit-form.client.view.html',
+			restrict: 'E',
             scope: {
                 myform:'='
             },