Yaaay
coba
Merge branch 'master' of https://github.com/raufan/ChoiceNovel

Conflicts:
	ChoiceNovelEngine/.classpath
	ChoiceNovelEngine/bin/classes.dex
	ChoiceNovelEngine/bin/dexedLibs/android-support-v4-dad4426157763f2c999160e5832b39d4.jar
	ChoiceNovelEngine/bin/dexedLibs/bolts-3235353755f99f70d1001fefe771cf88.jar
	ChoiceNovelEngine/bin/dexedLibs/facebooksdk-1ea55c70edb010b4858ae184ac40995f.jar
	ChoiceNovelEngine/bin/jarlist.cache
	ChoiceNovelEngine/bin/res/crunch/drawable/btn_next.png
	ChoiceNovelEngine/bin/res/crunch/drawable/btn_restart.png
	ChoiceNovelEngine/bin/res/crunch/drawable/facebook.png
	ChoiceNovelEngine/bin/res/crunch/drawable/ico_novel.png
	ChoiceNovelEngine/bin/res/crunch/drawable/ico_stats.png
	ChoiceNovelEngine/bin/res/crunch/drawable/splashpic.png
	ChoiceNovelEngine/bin/res/crunch/drawable/twitter.png
	ChoiceNovelEngine/bin/resources.ap_
	facebook-android-sdk-3.16/facebook/bin/facebooksdk.jar