Update.
Merge branch 'master' of github.com:LCYY/DimBoard

Conflicts:
	DimBoard/DimBoard.xcodeproj/project.pbxproj