Testing rebase
Merge branch 'Development' of https://github.com/slopyjoe/fitnesscenter into Development

Conflicts:
	app/controllers/Dashboard.java
	app/views/report.scala.html
	conf/routes
	public/javascripts/user_report.js