last but not least
Merge branch 'master' of https://github.com/SuikoHero38/CraveParty

Conflicts:
	FINAL/JakeWharton-ActionBarSherlock-e5c2d1c/library/res/values-en/strings.xml
	FINAL/JakeWharton-ActionBarSherlock-e5c2d1c/library/src/com/exypnos/craveparty/controller/SearchActivity.java
	FINAL/JakeWharton-ActionBarSherlock-e5c2d1c/library/src/com/exypnos/craveparty/controller/SearchPartyActivity.java