aa

aa
Merge branch 'yiikou'

Conflicts:
	SPainter.h