- minor fixes
Added color function to activity graph.
- fixed Type-Color-Bug
Merge branch 'feature_resourceFilter' into develop_lemo2