Revert "fix text"

This reverts commit 385ee553de53f601316e35135d94520c0e2362fe.
Merge branch 'master' into develop

Conflicts:
	html/template.html