Fix config file
Merge branch 'develop' of github.com:infinispan/infinispan.github.io into develop

Conflicts:
	_config/ispn.yml