fixed build scripts
Release Jelix 1.2.11
Bumped version to 1.2.12pre.SERIAL
Merge branch 'jelix-1.2.x' into jelix-1.3.x
Release Jelix 1.3.5
Bumped version to 1.3.6pre.SERIAL
Merge branch 'jelix-1.3.x' into jelix-1.4.x

Conflicts:
	build/buildapp.php
Release Jelix 1.4.2
merge
Bumped version to 1.4.3pre