Finish activity when user has been forced out of the system
Update build.gradle, and location card utilities
Fix location card issues
Merge branch 'master' into prod