some changes
Merge branch 'development' of https://github.com/haron4igg/osym into development

Conflicts:
	Osym/.idea/workspace.xml
	Osym/out/artifacts/Osym/Osym.jar
	Osym/out/production/Osym/org/osym/Gui/MainWindow.class
	no_triplet/.idea/workspace.xml
ololo