doing manage task
Merge branch 'dev' of https://github.com/moreD/Tyche-Online-Judge into dev

Conflicts:
	web/WEB-INF/src/com/tyche/user/service/UserService.java