...
Merge branch 'master' of https://github.com/martinvolk/WolframEngine

Conflicts:
	src/framework/Licensee.h
Merge branch 'master' of https://github.com/martinvolk/WolframEngine