Pulling upstream
Merge branch 'master' of https://github.com/drgnak/eclipse-kingdom2

Conflicts:
	CMakeLists.txt
	src/main.cpp