Revert "Revert "Merge branch 'master' of https://github.com/BirminghamConservatoire/IntegraLive into Release""

This reverts commit f9b4d434fee5087eba7e4656771ad0f18960cc18.

Conflicts:
	libIntegra/src/luascripting.c