updated opencga-server catalog.properties with new email config property names
conflict resolution
Merge branch 'feature/refactoring' of github.com:opencb/opencga into feature/refactoring
Merge branch 'feature/refactoring' of github.com:j-coll/opencga into feature/refactoring
Merge branch 'feature/refactoring' of github.com:j-coll/opencga into feature/refactoring
Merge branch 'feature/refactoring' of github.com:opencb/opencga into feature/refactoring
SgeManager, added -V option to qsub to export all environment variables
app: Dependency problem fixed. Excluded apache.commons.codec in opencga-app from opencga-lib

opencb.commons.utils.CryptoUtils uses commons.codec version 1.7, and opencga-lib had the same dependency with version 1.3.
Merge branch 'feature/refactoring' of https://github.com/opencb/opencga into feature/refactoring