Login
Merge branch 'master' of https://github.com/ifaniqbal/Sipenlatif

Conflicts:
	src/main/java/id/co/sipenlatif/domain/User.java
	src/main/webapp/WEB-INF/spring/root-context.xml