retab Collaborators.js
retab TripController
retab map.js
Merge branch 'angular' of https://github.com/ckwang/ST into angular
Merge branch 'angular' of https://github.com/ckwang/ST into angular
fix permission filter