merged from trunk
remove .classpath
Merge branch 'master' of https://github.com/littcai/saap

Conflicts:
	saap/saap-web/src/main/java/com/litt/saap/system/service/impl/UserInfoServiceImpl.java
	saap/saap-web/src/main/webapp/pages/common/invite.jsp