Some small bug fixes
Merge branch 'HEAD' of https://github.com/newadigital/angular-app

Conflicts:
	client/app/scripts/services/ItemService.js