added password salt to services/couchdb.json (requires latest leap_cli)
Merge branch 'develop' of ssh://leap.se/leap_platform into develop