Merge branch 'upstream'

Conflicts:
	src/main/scala/app/AccountController.scala