intermediate
Merge branch 'develop' of github.com:NLeSC/eAstronomy-intermediate-visualization into develop

Conflicts:
	src/lofar/flaggers/IntermediateFlagger.java