Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
controllers - Secured.java - Commented out method
added forgottenPassword.html
installed GRUNT
started with ng-route, doesn't work yet, therefore it is not being used
wrote AngularJS files for the forgottenPassword webpage