new version
new version
new version runnable
new version
Merge remote-tracking branch 'origin/master'

Conflicts:
	projects/DrawingBoard/.idea/misc.xml
	projects/DrawingBoard/app/src/main/java/cn/edu/shu/android/group6/drawingboard/app/ui/ColorPickerFragment.java
	projects/DrawingBoard/drawingboard/src/main/java/cn/edu/shu/android/drawingboard/MainActivity.java
yy