Fixed string resources
add crittercism for crash and exception reporting
Merge remote-tracking branch 'origin-richk/master'
Fixed bugs with beacon updates, among other things.