disabled upload functionality
Merge branch 'master' into upload-disabled
Revert "disabled upload functionality"

This reverts commit 85ef3642fc2400a04ee8b5b23d5986ffae38ca1a.
get db info from VCAP_SERVICES if available
fixed VCAP_SERVICES, npm shrinkwrapped