Changes made by Desislava Plam (desislava.plam@gmail.com).
Merge branch 'master' of https://github.com/DesislavaPlam/WhereAmI.git
Merge branch 'master' of https://github.com/DesislavaPlam/WhereAmI.git