Added tests for Welcome angular controller with Jasmine.
Changed username/email field to accept usernames and emails
Merge remote-tracking branch 'origin/master'