Ok, bring everything from the master

Now the Github pages should work and update with every commit.