remove class ServiceOrderJsonProvider since OXM solution change
Merge branch 'master' of https://github.com/zhongdj/Swordfish

Conflicts:

Business/RESTfulWebServices/SchedulingRS/src/main/java/net/madz/rs/sched
uling/SchedulingApplication.java
Merge branch 'master' of https://github.com/zhongdj/Swordfish