ui issues
Merge branch 'master' of https://github.com/mbeloded/audioGPSTracker

Conflicts:
	res/layout/fragment_main.xml