various updates
Merge branch 'master' of https://github.com/cfaddict/cfo-groovy

Conflicts:
	index.html