bookmark activity reminder
Merge branch 'master' of git@github.com:StevenKo/novel_reader.git

Conflicts:
	src/com/android/novel/reader/BookmarkActivity.java