accept media param in get requests, add a return_task method
Merge branch 'development' of github.com:opentox/opentox-server into development