update api jsp
Merge branch 'develop' of https://github.com/FutureTV/fwd into develop
monitor
Merge branch 'develop' of https://github.com/FutureTV/fwd into develop
update api
api update oconfig
Merge branch 'develop' of https://github.com/FutureTV/fwd into develop