Merge pull request #39 from qatang/dev

hewang_更新20140714_02
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
shiro
更新pom
Merge branch 'master' of github.com:chirowong/cms

Conflicts:
	pom.xml
Merge branch 'dev' of github.com:qatang/cms
增加shiro
Merge branch 'master' of github.com:chirowong/cms
优化shiro
Merge branch 'master' of github.com:chirowong/cms

Conflicts:
	src/main/resources/spring-shiro.xml
Merge branch 'master' of github.com:chirowong/cms
shiro
shiro 授权
doc
Merge branch 'dev' of github.com:qatang/cms
Merge branch 'dev' of github.com:qatang/cms
修改界面
Merge branch 'master' of github.com:chirowong/cms

Conflicts:
	sql/tables.sql
	src/main/java/com/qatang/cms/controller/DashboardController.java
	src/main/java/com/qatang/cms/controller/SigninController.java
	src/main/java/com/qatang/cms/controller/SignupController.java
	src/main/java/com/qatang/cms/controller/user/UserController.java
	src/main/java/com/qatang/cms/dao/user/UserRoleDao.java
	src/main/java/com/qatang/cms/entity/menu/Menu.java
	src/main/java/com/qatang/cms/service/impl/user/UserServiceImpl.java
	src/main/resources/spring-mvc.xml
	src/main/resources/spring-shiro.xml
	src/main/webapp/WEB-INF/web.xml