Category
+Links fixed from submenu
Merge remote-tracking branch 'origin/masterPatrik' into
fixesBeforeGoogle_joakim

Conflicts:
	AndroidApp/src/com/beerdev/androidapp/AboutCategories.java
	AndroidApp/src/com/beerdev/androidapp/FragmentManagerActivity.java