Added form to login
Merge branch 'master' of https://github.com/stevejmason/TrainingProject-1

Conflicts:
	Build/eclipse-workspace/target/m2e-wtp/web-resources/META-INF/maven/com.cconsult/yescorp/pom.properties