Submit monitor failed runeihin, siistimistä edittiin
Merge branch 'master' of https://github.com/sampoz/sdp12

Conflicts:
	Titanium-UI/WebContent/ui.xhtml