sycn scheduler with develop
resolving conflicts
correcting scheduler resource classname
changing Impl class
Merge pull request #117 from zupta/tmp

Resolve conflicts in scheduler merge