merge
Merge branch 'orange3' of https://github.com/totruok/orange0 into orange3

Conflicts:
	src/main.cpp