import java.awt.Color in python bindings
fix jruby lib path into build.xml
merging and solve basic conflict
removed jython cachedir
add jython cachedir to .gitignore
re-generated welcome/basics/Basics.fr.html using po4a (some previous commit generated an empty file)