Rearrange categories and people
Merge branch 'master' of https://github.com/lufias/Shopick.git
Reenable barcode scanner code
Merge branch 'master' of https://github.com/lufias/Shopick.git

Conflicts:
	Shopick/app/barcode/barcode.js