Merge branch 'alexbranch'
Merge branch 'master' of https://github.com/prometheus-software/WhereYouApp