refactoring in forms
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/userProfile/period.scala.html
refactoring in form user-reset-password