完善部分底层功能
Merge remote-tracking branch 'origin/master'

Conflicts:
	maven-ssh/src/main/java/com/p2p/action/FooAction.java
	maven-ssh/src/main/java/com/p2p/bean/user/Role.hbm.xml
	maven-ssh/src/main/java/com/p2p/bean/user/Role.java
	maven-ssh/src/main/java/com/p2p/bean/user/User.hbm.xml
	maven-ssh/src/main/java/com/p2p/service/FooService.java