updated code to improved versions from docking-admin, fixed bug 802 and 797
Merge branch 'master' of https://github.com/AMCeScience/docking-gateway

necessary