test base tpl
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.php
	tpl/index.twig
add template for register page