test
CLeaned up code to remove actionbar sherlock requirements
Merge branch 'actionbar'

Conflicts:
	AndroidManifest.xml