索引更新
Merge remote-tracking branch 'origin/master'

Conflicts:
WebProject/serverPro/app/models/AddResource.java
WebProject/serverPro/conf/routes