moved categories to json
Merge branch 'master' of github.com:aadilsarfani/android-posm

Conflicts:
	res/values/strings.xml