changed Supervisor class file
Merge branch 'feature_20140321' into develop