Merge branch 'master' of http://github.com/joelcoxokc/clurtch

Conflicts:
	app/js/models/item/Item.js
	app/js/modules/states/item/item.jade
	app/js/modules/tabs/items/controllers/ItemsCTrl.js
	app/js/modules/tabs/items/views/items.jade
Merge branch 'master' of http://github.com/joelcoxokc/clurtch

Conflicts:
	app/js/modules/tabs/items/controllers/ItemsCTrl.js