added left navigation to the userdocs
Fixed conflicts