t
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/main/java/com/springapp/dao/UserMapper.java
	src/main/resource/com.springapp.persistence/UserMapper.xml
	src/main/webapp/resource/function.xml