Big fixes
Merge branch 'dev'

Conflicts:
	AndroidManifest.xml
Merge branch 'master' of github.com:vfonte91/TaxiMap