Merging "dev" with "master" to latest version

Mergin dev into master to latest version of BiljetApp showed at 24th May DEMO