Readded crashlytics to trainer version
Reverted to former settings storage approach
Trainer version sends alert every 30 sec
Disguise in running apps
Fixed blank message issue and fixed tests
Fixed merge conflicts
Fixed tests and constants
Updated content
Preliminary fix for APK upgrade
Solved merge conflicts
Merge tag 'v1.2.2' into crash
Fixed merge conflicts
Now alert frequency is configurable
Fixing calabash acceptance tests
Revert "Fixing calabash acceptance tests"

This reverts commit bae8d08b1724c7ad9ff6bdb0c2eeafff683e622b.
Update language resources
Update language resources