Removed a lot of extra code

closes #9
Merge branch 'master' into js-delete

Conflicts:
	app/controllers/concerns/item.coffee
	app/controllers/concerns/navigation.coffee