Generic contents for templates.
Merge branch 'master' of https://github.com/Goteo/Goteo

Conflicts:
	db/templates.sql