Merge pull request #1 from CMPUT301F14T17/master

merge with master
Added new Layout in activity_questionview that can be swapped to when we
need to create a question. Made QuestionViewActivity work as it did
before by hiding the new view.
Merge pull request #2 from CMPUT301F14T17/master

merge with master
Fixing test instrumentation and data manager bug.

Should always check to see that json elements are the type that you think
before using them, or they throw nasty exceptions.
Fixing some racy conditions in Data Manager tests.

It should no longer be possible for data manager tests to get stuck (ie,
very unlikely).
Pulling out some logic from common data manager tests.
- Implemented remaining local DataFilter functionality. Searching and Filtering operations should be fully supported locally and network wise now.
Merge pull request #154 from stravant/filtercomplete

Implemented remaining local DataFilter functionality
Fully implemented Question Creation via an alternate layout in the
QuestionViewActivity. Also made the Answer count field show correct
information.

Removed commented out section of code.

Made whitespace change to hopefully fix newline issue

fixed newlines

Fixed indentation

Fixed formatting of xml file

Moved hard-coded strings into strings.xml

Moved hard-coded strings into strings.xml

Fixed newlines again
Complete redo for Comment popup and general style changes
redo for Answer popup
Merge pull request #3 from CMPUT301F14T17/master

merge with master
Merge pull request #155 from coreyjamison/new_question_creation

Question creation
added strings and removed unused classes
merge with master
Merge pull request #156 from joelkeeling/master

Customized popups
Merge pull request #153 from Mobius5150/fixtests

Fixing issues with Tests
Adding slight performance improvement to QuestionView.
Add displaying to the QuestionViewActivity.
Making home button enabled for Question View.