create.html Complete
Add Minify Js
handle edit complete
Start PropertyResource list.html
null  BUG修复
Fix Bug In OneToMany Of AirlinePlan
肿么又没交上去。。。
Merge branch 'develop' of gitcafe.com:reyoung1110/ASIMS into develop
Department的 controllers
List UI Complete
Complete Handle Edit of PorpertyResource
Merge branch 'feature/PropertyResource' into develop

Conflicts:
	conf/routes