freemarker
Merge branch 'master' of https://github.com/GiulioGx/Jama.git

Conflicts:
	Docs/Tesi/Tesi.pdf