Back to the master branch

This update will put back the files into the main working copy without the modifications of Lucca. The updates of Lucca should be added later on.