Bug fixes - handle orientation change, strings, etc.
Bug fixes - handle orientation change, strings, etc.
Merge branch 'richak' of https://github.com/richk/ProjectBeacon into richak