Merge branch 'master' into gsoc2014

Merge done to get the Xtext update site fix in the the tps.