Fixed color palatte and resources for action bar
Merge branch 'feature_testing'

Conflicts:
	bin/Innutrac.apk
	bin/resources.ap_