yet another copyright update
prepared for 2.1 release
prepared for 2.1 release
Merge remote-tracking branch 'origin/master'

Conflicts:
	gradle/wrapper/gradle-wrapper.properties
	website/war/decorators/decorator.jsp