Notepad fixes
Merge branch 'mamontov'

Conflicts:
	src/safeguard/Engine.java