web service controller
Merge branch 'ready_for_dev'