item test case 1
item test case 2
Merge remote-tracking branch 'origin/master'

Conflicts:
	test/controllers/ctrl_item.js