Cleaned up mee_analyse_region to generate conflicts.
Merge branch 'trunk' of https://github.com/bogdanneacsa/tvb-simulator into trunk