before pull fro jcoll
Merge branch 'feature/catalog' of github.com:j-coll/opencga into feature/catalog
before another pull jcoll
Cleaning tests
Merge branch 'feature/catalog' of github.com:j-coll/opencga into feature/catalog
Cleaning tests
catalog: Added ACL filtering.
catalog: ShareFile and ShareProject implemented.
Merge branch 'feature/catalog' of https://github.com/jmmut/opencga into feature/catalog

Conflicts:
	opencga-catalog/opencga-catalog-core/src/main/java/org/opencb/opencga/catalog/core/db/CatalogMongoDBAdaptor.java
code for user, project and study
Merge branch 'feature/catalog' of https://github.com/roalva1/opencga into feature/catalog
catalog: minor changes
Merge branch 'feature/catalog' of https://github.com/jmmut/opencga into feature/catalog
Remove test db before launching tests
Merge pull request #1 from aaleman/feature/catalog-jcoll

Remove test db before launching tests
Merge branch 'feature/catalog' of github.com:j-coll/opencga into feature/catalog

Conflicts:
	opencga-catalog/opencga-catalog-core/src/test/java/org/opencb/opencga/catalog/core/db/CatalogMongoDBAdaptorTest.java
catalog: Modified some "create" methods. CreateFolder with parents=true creates all parents in DB
catalog: started upload file. Also, added properties to test.

The next line must be added in ~/.m2/settings.xml:
<CATALOG.TEST.DATABASE>catalogTest</CATALOG.TEST.DATABASE>
Merge branch 'feature/catalog' of https://github.com/j-coll/opencga into feature/catalog

Conflicts:
	opencga-catalog/opencga-catalog-core/src/main/java/org/opencb/opencga/catalog/core/db/CatalogDBAdaptor.java
	opencga-catalog/opencga-catalog-core/src/main/java/org/opencb/opencga/catalog/core/db/CatalogMongoDBAdaptor.java
	opencga-catalog/opencga-catalog-core/src/test/java/org/opencb/opencga/catalog/core/CatalogManagerTest.java