Layout fix
Merge branch 'master' of github.com:nearbydelta/Coway

Conflicts:
	models/Items.js