Merge branch 'master' of git://github.com/qiujiejun/booxsdk

Conflicts:
	code/src/ui/onyx_ui_images.qrc
Merge branch 'master' of github.com:onyx-intl/booxsdk
Merge branch 'master' of github.com:onyx-intl/booxsdk