Merge branch 'develop' into feature/reorganize

diff --cc views/front/registrations/registration.html
index 2257967,0beb2ba..52bfc32
--- 1/views/front/registrations/registration.html
--- 2/views/front/registrations/registration.html
+++ b/views/front/registrations/registration.html
@@@ -301,7 -245,6 +301,9 @@@ var app = 
      Models: { Front: {}, Admin: {} },
      Collections: { Front: {}, Admin: {} },
      Views: { Front: {}, Admin: {} },
++
 +    //Times: {$regTimesJSON},
++
      isValidEmail: function( email ){
          var regex = {literal}/^([a-zA-Z0-9_.+-])+\@(([a-zA-Z0-9-])+\.)+([a-zA-Z0-9]{2,4})+$/;{/literal}
          return regex.test(email);