Merge pull request #226 from raghuvissu/master

city name changed to city/area in createclient and new activation
locale  file added for icelandic language
Merge remote-tracking branch 'upstream/master'