Added willow-full and ubremen environment.
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.
merge and idea files removed from the project