Integrate sourcecode
Merge branch 'master' of https://github.com/rheicide/front-end-demo

Conflicts:
	src/main/java/com/axonactive/win3/controllers/LoginController.java
	src/main/webapp/js/movie-router.js
Merge branch 'master' of https://github.com/rheicide/front-end-demo
Merge branch 'master' of https://github.com/rheicide/front-end-demo

Conflicts:
	src/main/java/com/axonactive/win3/controllers/LoginController.java
	src/main/webapp/js/movie-router.js
Merge branch 'master' of https://github.com/rheicide/front-end-demo
Add Reset password bean configuration
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/web.xml
	src/main/webapp/js/main.js
Update validation message