- next
Merge branch 'master' of github.com:perfidia/uceditor

Conflicts:
	src/forms_generated/ConditionWindow.py
	src/forms_generated/Mainwindow.py
	src/forms_generated/ReferencesWindow.py
	src/forms_generated/UseCaseWindow.py
	src/forms_generated/actor.py
	src/forms_generated/businessobject.py
	src/forms_generated/businessobjectcreate.py
	src/forms_generated/businessrules.py
	src/forms_generated/extensions.py
	src/forms_generated/priority.py
	src/forms_generated/projectCreatewindow.py
	src/forms_generated/projectwindow.py
	src/forms_generated/stepwindow.py
Merge branch 'master' of github.com:perfidia/uceditor
- running version