implement includes / excludes operators for the condition parser
Merge branch 'dev' of github.com:Bergrebell/CyberCoach into dev