simplify org.caleydo.view.filter
Merge branch 'develop' of git@github.com:Caleydo/caleydo-dev.git into develop
Merge branch 'develop' of git@github.com:Caleydo/caleydo-dev.git into develop
Merge branch 'develop' of git@github.com:Caleydo/caleydo-dev.git into develop
#1847 changes for April 2014 run