update master to version 121
Merge pull request #79 from sigourney/master

update master to version 121
changed client to reflect new DNS name structure
Merge pull request #80 from sigourney/master

changed client to reflect new DNS name structure
Merge of new DNS structure refactor into Develop
Test suite for updater dialog started; merging in all the changes from develops server DNS changes.