commit ganti bahasa
Anggap aja bener.
Lanjutin Bud

Merge remote-tracking branch 'origin/master'

Conflicts:
	FINAL/JakeWharton-ActionBarSherlock-e5c2d1c/library/res/layout/activity_main.xml
	FINAL/JakeWharton-ActionBarSherlock-e5c2d1c/library/res/layout/activity_search.xml
	FINAL/JakeWharton-ActionBarSherlock-e5c2d1c/library/src/com/exypnos/craveparty/controller/MainActivity.java
	FINAL/JakeWharton-ActionBarSherlock-e5c2d1c/library/src/com/exypnos/craveparty/controller/SettingActivity.java