resolve conflicts
Merge branch 'master' of https://github.com/SuikoHero38/CraveParty

Conflicts:
	FINAL/JakeWharton-ActionBarSherlock-e5c2d1c/library/AndroidManifest.xml
	FINAL/JakeWharton-ActionBarSherlock-e5c2d1c/library/res/values/strings.xml
	FINAL/JakeWharton-ActionBarSherlock-e5c2d1c/library/src/com/exypnos/craveparty/libs/DBConnector.java