shit
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/rheicide/front-end-demo
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'remotes/origin/Hoang_AI-2943-Account-Locking'
commit forgot password page with fake loginController and main.js to run alone
Merge branch 'master' into lhnam-AL2951-forgot-password-page
Merge branch 'master' into lhnam-AL2951-forgot-password-page

Conflicts:
	src/main/java/com/axonactive/win3/dao/impl/ActivityDaoImpl.java
	src/main/resources/messages_en_US.properties
	src/main/resources/spring-config/locale.xml