style update
Merge branch 'master' of https://github.com/scbd/absch.cbd.int

Conflicts:
	app/views/help/presentation.html
	app/views/help/presentation.html.js