Merge pull request #11 from RMASBench/master

Fix unproperly initialized proxied factors
Merge pull request #12 from RMASBench/master

Fix the WeightingFactor factor
Fix the SingleWeightFactor factor.
Fix the SingleWeightFactor factor.
nicer fix
Merge pull request #13 from tonipenya/master

Fix the SingleWeightFactor factor.
Small fixes to enable new changes in RSLB2
Minor error reporting improvement
Added test for ConditionedSelectorFactor
Added test for ConditionedSelectorFactor
Merge pull request #14 from tonipenya/master

Added test for ConditionedSelectorFactor
Switch to IntelliJ + Maven, fix warnings
Settings...
Remove files which should not be tracked
Set mockito as a test dependency instead of compile dependency
Add artifact to generate the projects jar file
Added a test for the independent factor
added method to retieve conditioned neighbor
[bug-fix] was not removing all occurences of a neighbor
Merge branch 'master' into intellij

Conflicts:
	src/main/java/es/csic/iiia/maxsum/factors/AbstractTwoSidedFactor.java