updated docking
Merge branch 'create-docking-station' into development