old
alt
fixed
blah
blahh
ok
before merge
Merge branch 'slave'

Conflicts:
	target/m2e-wtp/web-resources/META-INF/maven/be.vdab/SpringVideostore/pom.properties
almost final