删除了一些类
Merge branch 'master' of https://github.com/CRSP/CRSP

Conflicts:
	src/com/crsp/dto/BaseDTO.java
	src/com/crsp/service/UserServiceI.java