html update

Signed-off-by: alkaest2002 <p.calanna@gmail.com>
Merge branch 'develop'

Signed-off-by: alkaest2002 <p.calanna@gmail.com>

Conflicts:
	site/templates/default.php
	site/templates/home.php
	site/templates/test.php
	site/templates/tests.php