merged stashed changes

public/modules/forms/directives/edit-form.client.directive.js

@@ -26,14 +26,13 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', '$q', '$ht
                 $scope.accordion = {};
                 $scope.accordion.oneAtATime = true;
 
-                // Add a new field to form
+                // Add a new field
                 $scope.addNewField = function(fieldType){
 
                     // incr field_id counter
                     $scope.addField.lastAddedID++;
                     var fieldTitle;
 
-                    //F
                     for(var i = 0; i < $scope.addField.types.length; i++){
                         // console.log($scope.addField.types[i].name === fieldType);
                         if($scope.addField.types[i].name === fieldType){

public/modules/forms/views/view-form-submissions.view.html

@@ -12,6 +12,7 @@
 				</a>
 			</small>
 		</div>
+
 	</div>
 	<div class="row">
 

public/modules/users/config/users.client.config.js

@@ -22,4 +22,4 @@ angular.module('users').config(['$httpProvider',
         }
       };
     });
-}]);
+}]);