woopeex
Merge branch 'develop'

Conflicts:
	examples/examplescene.py
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'

Conflicts:
	examples/examplescene.py
Merge remote-tracking branch 'remotes/origin/develop'
Merge remote-tracking branch 'origin/master'
.
.
Merge remote-tracking branch 'origin/master' into develop
Merge remote-tracking branch 'remotes/origin/develop'
Merge remote-tracking branch 'origin/master' into develop