Start WOD.
Finish WOD.
Merge branch 'cloudauthentication-2'

Conflicts:
	app/Global.java
	app/models/UserInfoDB.java
	app/views/Login.scala.html
	conf/application.conf