Integration with backend for report
Merge branch 'master' of https://github.com/ClemMakesApps/Nonzi

Conflicts:
	client/app/report/report.controller.js
	client/app/report/report.html