Started on uploadImage on add_item
Merge remote-tracking branch 'origin/shiqi's-angular' into shiqi's-angular

Conflicts:
	kgapp/js/app.js