assignment page, apply new service.

assignment page, apply new service.
Merge branch 'master' of https://github.com/Super-Warrior/itms

Conflicts:
	bower.json
	build.config.js
	src/app/planning/detail/erDetail.ctrl.js