Merge pull request #53 from iRail/master

Merge production
Bug with archived departures fixed
Merge branch 'development' of github.com:iRail/hyperRail into development
Merge pull request #54 from iRail/development

Fix bug in archived departures