new branch mario_dev
Merge branch 'nikita_dev' into mario_dev

Conflicts:
	src/cmp/CmpConfig.cpp
	src/cmp/Processor.cpp
	src/perf/IterativePerfModel.cpp
	src/power/PowerModel.cpp
	tasks_mpi.txt
updating before switching to another branch
Merge branch 'tmap' into mario_dev
cleaning before merging with tmap
temporary update
Temperature constraint: penalty modified. SkipRemapping improved
new SkipRemapping
Merge from mario_dev