Merge branch 'develop'

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

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

Conflicts:
	examples/examplescene.py
woopeex
Merge branch 'develop' of https://github.com/woopeex/edd into develop
Merge branch 'develop'

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

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

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

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

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

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

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

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

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

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

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

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

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

Conflicts:
	examples/examplescene.py
Merge branch 'develop' of https://github.com/woopeex/edd into develop