Merge branch 'shiqi's-angular' of https://github.com/chenshiqi/IDP into shiqi's-angular

Conflicts:
	kgapp/js/app.js
	kgapp/json/Item.json
	kgapp/partials/login.html
deconflict
Merge branch 'shiqi's-angular' of https://github.com/chenshiqi/IDP into shiqi's-angular

Conflicts:
	kgapp/js/app.js
	kgapp/json/Item.json
	kgapp/partials/login.html