change

Signed-off-by: netwenchao <netwenchao@hotmail.com>
Merge branch 'master' of https://github.com/netwenchao/StoryRollUp

Conflicts:
	MedBooks/bin/MedBooks.apk
	MedBooks/bin/resources.ap_