ignore
Merge branch 'development' of https://github.com/AGmakonts/STL.git into development

Conflicts:
	.buildpath
	.gitignore
no message
no message