New release
Merge branch 'master' of https://github.com/tvdzwan/hyperion

Conflicts:
	deploy/HyperCon.jar