Introduce a templating system
Merge branch 'master' into templating

Conflicts:
	templates/payment.php