change
Merge branch 'master' of https://github.com/codeocelot/config_manager

Conflicts:
	Client/MacroSummaryViewer/angular/MacroSummaryViewer.js
Merge branch 'master' of https://github.com/codeocelot/config_manager
final changes