Merge branch 'release/staging'
Merge branch 'develop0.8'
updated version to 1.0.0
added staging env to cluster.js
staging env in cluster.js
fixed problem in cluster2 with pidfile name
Merge branch 'release/staging'

Conflicts:
	NEWS.md
	package.json
Merge branch 'release/staging'
Merge branch 'release/v2.0'
Merge branch 'release/staging'
Merge branch 'release/staging'
Merge branch 'release/staging'
Merge branch 'release/staging'
Merge branch 'release/staging'
Fix shrinkwrap after re-install of cluster2

.. it looks like version 1.1.62 of node module npm was removed
from the npm registry ..
Merge branch 'release/staging'
Merge branch 'release/staging'
Merge branch 'release/staging'
Merge remote-tracking branch 'upstream/master' into develop
removed cartodb userid/database constrant, add user_id params on query