Merge pull request #52 from KiaFathi/kiaFeatures

Fix settings.html to correctly display data
Fix settings page city display