Added things
Merge branch 'master' of https://github.com/CMPUT301F14T14/Project into Sort
Uploader Service stub
Merge branch 'master' of https://github.com/CMPUT301F14T14/Project
Merge branch 'master' of https://github.com/CMPUT301F14T14/Project
Added missing sorts
Fixes
Merge pull request #171 from Kopo101/addSorts

Add missing sorts
AboutBox added

Added layout, code for about box. Also imported the Qasper logo.
added fix for empty question creation
Fixed some things
Added AboutBox option into welcome screen

Tried adding a ? button in the MainActivity but broke the layout, so I
reverted my changes.
Merge pull request #172 from linster/master

Added logo, AboutBox
Merge branch 'master' of https://github.com/CMPUT301F14T14/Project into Sort
Added consistency to sorting
Add things to make app look nicer
Merge pull request #174 from CMPUT301F14T14/Sort

Sort Added And add upvotes to the question list, Welcome screen added textview
Restrict searches to questions and answers only.
Use default serializers. These work fine, and will handle new data better. Also stores parent usefully.

Sorry I broke data again.
Fixed multiple upvotes question