Reformated code to old style
Merge branch 'ECD1'
Reformated code to old style
Merge branch 'ECF2'
Edited ConfigurationManager - removed code format data