some exclude
gandilngMerge branch 'master' of https://github.com/gandilong/Mana

Conflicts:
	backup/sys_20130623.sql
	web/WEB-INF/classes/com/thang/entity/system/Role.class
	web/WEB-INF/classes/com/thang/tools/auth/DBRealm.class
	web/WEB-INF/classes/com/thang/web/system/UserAction.class
	web/WEB-INF/classes/dbconfig.properties