Save locally
Merge branch 'master' into CleanUpNetworkController
Merged from master
Merge pull request #29 from LocalStory/CleanUpNetworkController

Clean up network controller