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

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