Version 0.5.0 -> open-source
Merge branch 'master' of ssh://naco-tarh/tarh/naco

Conflicts:
	.gitignore