Updated documentation
Merge branch 'master' of github.com:eea/eea.plonebuildout.core

Conflicts:
	README.txt
Merge branch 'master' of github.com:eea/eea.plonebuildout.core

Conflicts:
	README.txt