src/main/java/org/genesys2/server/config/ApplicationProps.java · 4ea27d63c8d27535daf11a7f265aad69e6c3e0b0 · Genesys PGR / Genesys Backend

Merge branch 'master' into emailvalidation-igoshin · 4ea27d63

Matija Obreza authored Jan 15, 2014

Conflicts:
	pom.xml
	src/main/java/org/genesys2/server/service/UserService.java
	src/main/java/org/genesys2/server/service/impl/UserServiceImpl.java
	src/main/java/org/genesys2/server/servlet/controller/UserProfileController.java
	src/main/resources/spring/spring.properties
	src/main/webapp/WEB-INF/jsp/user/profile.jsp

4ea27d63