Merge pull request #225 from raghuvissu/master

macid and serial number added in selfcare registration
city name changed to city/area in createclient and new activation
Merge remote-tracking branch 'upstream/master'