commit service upgrade1234
Merge branch 'master' of
https://github.com/League-of-Noobs/app-server.git

Conflicts:
	jersey1-grizzly2-spring/src/main/java/com/LeagueofNoobs/model/impl/UserImpl.java
	jersey1-grizzly2-spring/src/main/java/com/LeagueofNoobs/service/impl/DaoServiceImpl.java
	jersey1-grizzly2-spring/src/main/java/com/LeagueofNoobs/service/impl/SequenceServiceImpl.java
	jersey1-grizzly2-spring/src/main/resources/spring/spring-core.xml