Update AndroidManifest.xml
Merge pull request #156 from ospar0829/develop

Update AndroidManifest.xml
Merge branch 'develop' of github.com:ushahidi/Ushahidi_Android into develop
Remove debug code
Remove duplicate entries in manifest file
Only enable analytics if a GA code is setup
Increase version number
Fix filtering markers on the map by categories
Update changelog
Switch to using prod map key
Fix map api key