merged the content of build and local repository from the last working commit together with the latest content of all projects
Merge branch 'issue-17-stillworking'

Conflicts:
	org.foam.cli/runnable-foam.bndrun
	org.foam.models/build.gradle
	org.foam.xtext.ctl/build.gradle
	org.foam.xtext.ctl/build.properties
	org.foam.xtext.ltl/build.properties
	org.foam.xtext.plogic/bnd.bnd
	org.foam.xtext.plogic/build.gradle
	org.foam.xtext.plogic/build.properties
fixed cnf that was causing the "Skipping conflicting project..." messages