Fix documentation
Move protected
general change
Merge branch 'master' of https://github.com/ahayamb/opaintgl

Conflicts:
	OpaintGL.layout