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
Merge pull request #240 from iameric1986/noMockServer

No mock server
viewquestion changes
merging conflicts
VIEW QUESTION UI TESTS DONE BITCHES
sort filter test working
Added current dia, still needs to be prettied up
Merge pull request #242 from pachalad/noMockServer

Added current dia, still needs to be prettied up
added UI testing for mainActivity and fixed doms UItest
changed 30 questions added
Merge remote-tracking branch 'upstream/noMockServer' into noMockServer
Merge pull request #243 from rjynn/noMockServer

No mock server
added some tests for UI
UML UML UML!
Merge pull request #244 from pachalad/noMockServer

UML UML UML!
added userListsUITest
Merge remote-tracking branch 'upstream/noMockServer' into noMockServer
Merge pull request #245 from rjynn/noMockServer

No mock server
Merge from upstream