Updating from upstream.
Merge branch 'master' of https://github.com/lds-reporting/site-reporting
Start work on trends view.
Merge branch 'master' of https://github.com/lds-reporting/site-reporting

Conflicts:
	public/services/report-service.js
	public/views/reports/reports.html
working on controllers
merging with upstream
added reportCtrl
Merge pull request #14 from jasonalmaturner/master

Adding server side controllers.
Fixes reports view and report service endpoints to match server endpoints.
Merge branch 'master' of https://github.com/lds-reporting/site-reporting

Conflicts:
	public/services/report-service.js
Merge pull request #15 from jacob-israel-turner/master

Updates report view, controller, and service to match server endpoint.
updating small changes
Merge pull request #16 from FernandaS/master

updating small changes
Updating reports.html
added usersCtrl
Merge branch 'master' of https://github.com/lds-reporting/site-reporting
Merge pull request #17 from jasonalmaturner/master

Added another controller.
Merge branch 'master' of https://github.com/lds-reporting/site-reporting
adds services to post data
Merge pull request #18 from bloodhawk/master

adds services to post data