again?
Merge branch 'master' of https://github.com/jcomhaire/consultantHunter

Conflicts:
	AndroidManifest.xml
	src/org/axxes/consultantHunter/MainActivity.java