masih error yg labil
lupa commit kemarin
Merge branch 'master' of https://github.com/raufan/ChoiceNovel

Conflicts:
	ChoiceNovelEngine/bin/ChoiceNovelEngine.apk
	ChoiceNovelEngine/bin/classes.dex
	ChoiceNovelEngine/bin/dexedLibs/android-support-v4-3875a35d5a246d6a4f23a7d702f84d03.jar
	ChoiceNovelEngine/bin/dexedLibs/annotations-c27012f7850b676f4d43c7e634f7936e.jar
	ChoiceNovelEngine/bin/resources.ap_
	ChoiceNovelEngine/src/com/choicenovelengine/Content.java
	ChoiceNovelEngine/src/com/choicenovelengine/business/DatabaseHelper.java