Various fixes in GUI
Merge branch 'master' of https://github.com/V1del/ohsom.git

Conflicts:
	Ohsom/src/bo/Code.java