add security prepare to fixed transcational bug
Merge branch 'master' of https://github.com/fightteam/avalon

Conflicts:
	management/app/scripts/views/permission.coffee
	service/src/main/java/org/fightteam/avalon/web/filter/CORSFilter.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	service/src/test/java/org/fightteam/avalon/security/service/ResourceServiceTest.java
Merge branch 'master' of https://github.com/fightteam/avalon

Conflicts:
	management/app/scripts/templates/permission-edit.ejs
	management/app/scripts/views/permission.coffee
add
Merge branch 'master' of https://github.com/fightteam/avalon
add security prepare to fixed transcational bug