Signed-off-by: cncduLee <shouli1990@gmail.com>
Merge branch 'master' of https://github.com/cncduLee/bbks-andr.git

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	bin/bbks-andr.apk
	bin/classes.dex
	bin/classes/greendroid/widget/QuickActionBar.class
	bin/classes/greendroid/widget/QuickActionGrid.class
	bin/classes/greendroid/widget/QuickActionWidget.class
	bin/res/drawable-hdpi/left_menu_newbook.png
	bin/resources.ap_

Signed-off-by: cncduLee <shouli1990@gmail.com>