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
add ctrl to add site modal
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
fix merge conflic
Merge remote-tracking branch 'upstream/master'

Conflicts:
	server-assets/services/userService.js
adds new site report
Merge pull request #87 from eklyman/master

adds new site report
Merge pull request #88 from bloodhawk/master

adds bcrypt instance and class methods
Fixes report put.  Done!
fix edit modal ctrl
adds profile, admin
Merge pull request #89 from jacob-israel-turner/master

Fixes report put.  Done!
Merge pull request #90 from eklyman/master

fix edit modal ctrl