modified to use singleton in the iOS app
Merge branch 'master' of https://github.com/radzinzki/FYP