Merge remote-tracking branch 'weierophinney/feature/mvc-servicemanager-refactor'