��Ӳ˵��ı����ɾ����
Merge branch 'master' of https://github.com/cocosvsn/demo
some test do nothing
Add annotation for method and class.
Merge branch 'master' of https://github.com/cocosvsn/demo

Conflicts:
	src/main/java/cn/sh/sbl/hotel/service/IFileService.java
	src/main/java/cn/sh/sbl/hotel/service/impl/FileService.java
	src/main/java/cn/sh/sbl/hotel/web/action/ConsoleController.java
	src/main/webapp/index.jsp
Merge pull request #10 from cxxwode/master

do nothing usefull but a test and implement some function