Merge branch 'freemarker'

Conflicts:
	ftl/mysql-resources.ftl
Merge branch 'master' of https://github.com/matteopic/dbmanager.git