ugf
Merge branch 'master' of github.com:pryv/pryv.github.com

Conflicts:
	event-types.html
	overview-sections/overview.html
	overview.html
	reference-sections/public-channels.html
	reference.html