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

Conflicts:
	server.js
Merge branch 'master' of https://github.com/lds-reporting/site-reporting
Merge pull request #85 from eklyman/master

add ctrl to add site modal
Merge branch 'master' of https://github.com/lds-reporting/site-reporting
Fixing login to compare passwords.
Tests reportService, fixes most of them.
Get all users.
Merge pull request #86 from jacob-israel-turner/master

updates login
adds new site report