refactor form report user
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/userProfile/lastWeek.scala.html