commit check in
Merge branch 'master' of https://github.com/SuikoHero38/CraveParty

Conflicts:
	FINAL/JakeWharton-ActionBarSherlock-e5c2d1c/library/AndroidManifest.xml