pagina edit template
Merge remote-tracking branch 'upstream/master'
varie
languages
Merge pull request #103 from pisi79/master

clone cs