Map launch
Merge branch 'master' of github.com:whoshuu/chimerider
Add tab to map
Merge branch 'master' of github.com:whoshuu/chimerider

Conflicts:
	AndroidManifest.xml