Fixed the mock server so that it will now load new messages added to it properly after the program is closed.
Merging with files pushed from home
Merge pull request #196 from iameric1986/master

Fixed the mock server so that it will now load new messages added to it properly after the program is closed.
remove upc object from viewquestion
Merge pull request #201 from tbrockman/master

remove upc object from viewquestion