add circleView
Merge http://github.com/android-fucking/drawing-board

Conflicts:
	projects/DrawingBoard/drawingboard/src/main/java/cn/edu/shu/android/drawingboard/MyApplication.java
	projects/DrawingBoard/drawingboard/src/main/java/cn/edu/shu/android/drawingboard/core/elements/GenerationSlide.java
Merge remote-tracking branch 'origin/master'
add circleView
CircleView 调色环实现选择颜色
Merge branch 'master' of http://github.com/android-fucking/drawing-board