Google Map fixes, Init Categories SharedPrefs
Merge remote-tracking branch 'origin/master'