iRail/hyperRail — pull request #45 by pietercolpaert (2014-07-16 13:09:18+00:00)
Title: 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