fixing database issue
reverted + refactored jobbeans to give the max heap size via command line
increased version number
added pridemetatable testing class
Increased minor version
added predicates ---> client has control over them for now...still applicable elsewhere
added extra testcase to ignore list
Made adjustments to allow gui to actually test the predicates
Enable predicate selection in client
Merge branch 'develop' into fixing_database_IOissue

Conflicts:
	.gitignore
	compomics-relims/pom.xml
	compomics-relims/src/main/java/com/compomics/relims/concurrent/RelimsJobController.java
	compomics-relims/src/main/java/com/compomics/relims/conf/RelimsProperties.java
	compomics-relims/src/main/java/com/compomics/relims/model/beans/PeptideShakerJobBean.java
	compomics-relims/src/main/java/com/compomics/relims/model/provider/pride/PrideXMLDataProvider.java
	compomics-relims/src/main/java/com/compomics/relims/modes/networking/client/GUI/NewProjectDialog.form
	compomics-relims/src/main/java/com/compomics/relims/modes/networking/client/GUI/projectmanager/NewProjectDialog.java
	compomics-relims/src/main/java/com/compomics/relims/modes/networking/controller/connectivity/database/DAO/DAO.java
	compomics-relims/src/main/java/com/compomics/relims/modes/networking/controller/connectivity/database/DAO/WorkerSpecsDAO.java
fixing conflicts
added colims to relims-windows.properties
Merge branch 'develop' into fixing_database_IOissue

Conflicts:
	.gitignore
	compomics-relims/src/main/java/com/compomics/relims/concurrent/RelimsJobController.java
Merge branch 'fixing_database_IOissue' into develop

Conflicts:
	compomics-relims/pom.xml