Merge branch 'master' of https://github.com/amarfurt/healthbank

Conflicts:
	app/assets/javascripts/spaces.coffee
Merge branch 'master' of https://github.com/amarfurt/healthbank
Removed now unnecessary TODO.