合并
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/etong/canvasview_master/app/CircleCanvasView.java
	app/src/main/java/com/etong/canvasview_master/app/MainActivity.java