add missing files
Display classes without PP annotations at the collaboration view
Model getStatisticNumbers() to BuildStatistics job
add marker if for fuji problems
fixed bug @ collaboration view with preprocessors
fixed java warnings
revised collaboration model
pluginbuilder change
pluginbuilder change
removed dependencies from br.ufal.ic.colligens plugin
re-added colligens to pluginbuilder
test path changed
Merge branch 'master' of https://github.com/tthuem/FeatureIDE.git
fixed test paths
fix bugs @ 55, 56, 57
Collaboration View
Merge branch 'master' of ssh://git@github.com/tthuem/FeatureIDE.git

Conflicts:
	plugins/de.ovgu.featureide.core.mpl/src/de/ovgu/featureide/core/mpl/job/BuildStatisticsJob.java
Revert "Revert "Merge branch 'master' of github.com:tthuem/FeatureIDE""

This reverts commit 40aa87bef5cc908a58ebbd16b7aab5eb7ff9de6c.

Conflicts:
	plugins/de.ovgu.featureide.fm.ui/src/de/ovgu/featureide/fm/ui/editors/featuremodel/editparts/FeatureEditPart.java
Merge branch 'master' of github.com:tthuem/FeatureIDE