Merge pull request #19 from openwebwork/release/2.6

Release/2.6
Bring version number and copyright years up to date
Merge branch 'hotfix/fix_version' into develop

Conflicts:
	VERSION
         Fixed