Fixing merge conflicts on Plans Controller.
Fixing merge conflicts on Plans Controller.

derDaywalker/dmptool,2015SebINF1340/dmptool,derDaywalker/dmptool,derDaywalker/dmptool,2015SebINF1340/dmptool,2015SebINF1340/dmptool,derDaywalker/dmptool