1
Tes
Hilang spasi
Final sub part 1
Part 1
Merge branch 'master' of https://github.com/SuikoHero38/CraveParty
Merge branch 'master' of https://github.com/SuikoHero38/CraveParty

Conflicts:
	FINAL/JakeWharton-ActionBarSherlock-e5c2d1c/library/AndroidManifest.xml
no message
Merge branch 'master' of https://github.com/SuikoHero38/CraveParty

Conflicts:
	FINAL/JakeWharton-ActionBarSherlock-e5c2d1c/library/src/com/exypnos/craveparty/libs/DBConnector.java
no message
Merge commit '24605c781dec2da7f9529da814dc5d706389b208'

Conflicts:
	FINAL/JakeWharton-ActionBarSherlock-e5c2d1c/library/src/com/exypnos/craveparty/libs/DBConnector.java