Login stuff.
Merge branch 'master' of https://github.com/lds-reporting/site-reporting

Conflicts:
	server.js
setting ng-models in for the add site section
Fixes login, gets user object to front-end.  Mission accomplished.
Merge pull request #69 from FernandaS/master

setting ng-models in for the add site section
Merge pull request #70 from jacob-israel-turner/master

Fixes Login.
merged conflicts