Removing brownie characters
pull from origin catalog
Merge branch 'feature/catalog' of github.com:opencb/opencga into catalog-ws
first ws creating users
Merge branch 'feature/catalog' of github.com:opencb/opencga into catalog-ws
Merge branch 'feature/catalog' of github.com:roalva1/opencga into feature/catalog
Merge branch 'feature/catalog' of github.com:roalva1/opencga into feature/catalog
fixed CatalagoManager(Properties) constructor, OpenCGAWSServer now uses CatalagoManager(Properties)
merge conflicts