Merge branch 'master' of https://github.com/brainysmith/login-framework

Conflicts:
	src/main/scala/com/identityblitz/login/LoginFlow.scala
Merge branch 'master' of https://github.com/brainysmith/login-framework
Merge branch 'master' of https://github.com/brainysmith/login-framework
Merge branch 'master' of https://github.com/brainysmith/login-framework
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/brainysmith/login-framework

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