underline notranslate terms
Merge branch 'master' of github.com:Vizzuality/gfw

Conflicts:
	app/views/shared/_terms.html