merge
Merge branch 'master' of https://github.com/clucasa/Olympus

Conflicts:
	Olympus/Olympus.exe
	Olympus/inittimes.txt
Merge Michael's fixes, there is a problem with debug mode right now...