Added things
Merge branch 'master' of https://github.com/CMPUT301F14T14/Project into Sort
Get closer to Search working. Still some crash in layout stuff.

I needed to change the serializers for this to work, which required clearing the ES database.
Some refactoring
Forgot a line
Simplify layouts
Fix search view crash.

That was hellish. One little typo, and the debugger is totally useless.
Merge pull request #169 from stephenjust/search-fix

Get closer to Search working. Tapping on items still doesn't work.
Added missing sorts
Fixes
Merge pull request #171 from Kopo101/addSorts

Add missing sorts
added fix for empty question creation
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