Merge branch 'master' of https://github.com/joesaas/suneee

Conflicts:
	pom.xml
	suneee-ynt-service/src/main/java/com/suneee/ynt/user/mapper/UserMapper.xml
	suneee-ynt-web/src/main/resources/app-context-datasource.xml
	suneee-ynt-web/src/main/resources/config-db.properties