Merge branch 'master' of github.com:chirowong/cms

Conflicts:
	src/main/resources/spring-shiro.xml