little things here and there, categories, nav_bar, up buttons, etc.
Merge branch 'master' of https://github.com/kgnvch/Shoppit

Conflicts:
	shoppit/bin/Shoppit.apk
	shoppit/bin/classes.dex