login flow changed
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/scala/com/identityblitz/login/LoginFlow.scala
login flow changed