Local merge
Merged conflict in MpiControl
Merged conflict in Makefile
1. - Fixed inconsistency between grid and binary tree with multiple timesteps