Database is now working in a rough way
Database hooked up and saving the state of the assessment
Merge branch 'assess' into reports

Conflicts:
	js/controllers.js
	js/services.js