启用单元测试。
modify
Merge branch 'master' of https://github.com/btxhuman/somiyar into btxhuman-master
Merge pull request #3 from btxhuman/master

权限
添加sitemesh组件
完善sitemesh
Merge remote-tracking branch 'upstream/master'

Conflicts:
	web/src/main/webapp/WEB-INF/admin/index.jsp