basic updates
Merge branch 'master' of https://github.com/avalliani/betareturn

Conflicts:
	play/app/views/docs/how.scala.html
	play/app/views/signup/importMain.scala.html
Merge branch 'master' of https://github.com/avalliani/betareturn