test
Merge remote-tracking branch 'origin/master'
Added code to remove action bar
Merge remote-tracking branch 'aroth4Fetch/master'

Conflicts:
	Unbearable/.classpath