Fixed Edit and add events in GUI
Merge branch 'master' of https://github.com/jfjclarke/OOSEmini.git

Conflicts:
	OOSEmini/src/com/kiril/OpenChoice.java
	OOSEmini/src/com/kiril/ScaleChoice.java