Merge
Merge branch 'master' of https://github.com/michael9/mydemo4l_a.git
Merge branch 'master' of https://github.com/michael9/mydemo4l_a.git

Conflicts:
	MobleLib/res/values/color.xml