fix merge conflic
Merge remote-tracking branch 'upstream/master'

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

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

adds bcrypt instance and class methods
fix edit modal ctrl