Release of Jelix 1.2.12
Merge branch 'jelix-1.2' into jelix-1.3

Conflicts:
	index.gtw
Release of Jelix 1.3.6