Fixing calabash acceptance tests
Merge branch 'dev' of https://github.com/TeamPanicButton/PanicButton into dev