Merge branch 'master' of https://github.com/ruhaly/yingqida

Conflicts:
	richplay/src/com/paintpad/activity/Main.java
	richplay/src/com/paintpad/view/PaintView.java