changge
Merge branch 'master' of https://github.com/sonyi/ProjectForX-bionic

Conflicts:
	x-bionic/src/com/imcore/xbionic/product/ui/ProductMainActivity.java