Merge branch 'release/0.7.0.0' into next-minor

features/support/user_cuke_helpers.rb

@@ -69,8 +69,8 @@ module UserCukeHelpers
 
   def fill_in_new_user_form
     @username = "ohai"
-    fill_in('user_username', with: @username)
     fill_in('user_email', with: "#{@username}@example.com")
+    fill_in('user_username', with: @username)
     fill_in('user_password', with: 'secret')
     fill_in('user_password_confirmation', with: 'secret')