Cleaned-up conflict generator. Triangulation generator can generate dock positions near the border. Conflicts can be now generated using these "dock" positions loaded from problem xml file.
Refactoring the conflict generator. Work in progress.
Added 78_obstacles d-environments
merge and idea files removed from the project