server: modified @produces on web services, FileWSServer created
Merge branch 'feature/catalog' of github.com:opencb/opencga into feature/catalog
Catalog: created getFilePath with check parameter. Create FileWSServer chunked upload modifications
Merge branch 'feature/catalog' of github.com:opencb/opencga into feature/catalog
catalog: updated get<resource>Path to Uri.
Merge branch 'feature/refactoring' of https://github.com/opencb/opencga into feature/refactoring
catalog: minor fix.
catalog: All folders' path ends with "/"
pom: jmmut and j-coll added to developers
pom: roalva1 added to developers
app: catalog.properties added to conf folder
server: upload file, updated deprecated getFilePath
Merge branch 'feature/refactoring' of github.com:opencb/opencga into feature/refactoring
pom: Cellbase dependecy removed. Old Jersey libs from biodata-tools are excluded now in opencga-lib
Merge branch 'feature/catalog' into feature/refactoring
Merge branch 'feature/refactoring' of github.com:opencb/opencga into feature/refactoring
server: all WS client tests have been upgraded to Jersey 2.x
Merge branch 'feature/catalog' into feature/refactoring
catalog: study related fixes.

Conflicts:
	opencga-catalog/src/main/java/org/opencb/opencga/catalog/CatalogManager.java
Merge remote-tracking branch 'josemi/feature/catalog' into feature/refactoring