Merge branch 'NEW-MASTER' into Nima-Ghods
Merge branch 'Greg-Sauce' into Nima-Ghods
small changes
Merge branch 'Nima-Ghods' into Greg-Sauce
mode info and relax delay for balancing

added enumerated data type which contains current mode and time in the
mode. also balance mode delay added