Merge branch 'master' of https://github.com/CMPUT301F14T03/lotsofcodingkitty into noMockServer
Merge branch 'noMockServer' of https://github.com/CMPUT301F14T03/lotsofcodingkitty into noMockServer

bliasl;fkasl;fsl;afma
viewquestion changes
merging conflicts
VIEW QUESTION UI TESTS DONE BITCHES