Add Templating Engine
Merge remote-tracking branch 'origin/master'

Conflicts:
	Payments/src/main/java/web/controllers/HomeController.java