Merge branch 'master' of https://github.com/jbaicoianu/blender-brenda-master

Conflicts:
	render/module.html
Revert "Merge branch 'master' of https://github.com/jbaicoianu/blender-brenda-master"

This reverts commit ff77b1ae0a91b6d30479293a8848c2f75f78064a, reversing
changes made to 3dfc8a10dc4bc702b8066f6d2820207bd05c2ec1.
Merge branch 'master' of https://github.com/bioid/blender-brenda-dev

Conflicts:
	render/module.html