Updated EVERYTHING to current working copy state - Errors with Null consequences
Merge branch 'master' of github.com:sinjax/squall into dev

Conflicts:
	core/ReteStorm/src/main/java/org/openimaj/squall/orchestrate/greedy/GreedyOrchestrator.java