keep up to date with master changes

@Tuinslak Please commit to development first, test it (`vagrant up`), push develolpment to master only when we are updating the production server