Typos in logs
Add necessary layouts for matrix choice
Add background classes for matrix choice
Add strings
Add view adapter and necessary test drawables
More to dev/feature/issue-174-matrix-choice for parameters
Merge branch 'develop' into feature/issue-174-matrix-choice

Conflicts:
	daydreaming/src/debug/java/com/brainydroid/daydreaming/network/ServerConfig.java
	daydreaming/src/main/res/layout/question_multiple_choice_item.xml
	daydreaming/src/qa/java/com/brainydroid/daydreaming/network/ServerConfig.java
	daydreaming/src/release/java/com/brainydroid/daydreaming/network/ServerConfig.java
Fix location serialization problems
Fix regression in MultipleChoiceQuestionViewAdapter not saving answer
Get a basic version of matrix question working

Also pass around the parent layout in inflation to make sure
layoutParams are used. Updated the view adapters for that.
Merge branch 'develop' into feature/issue-174-matrix-choice
Add text to the buttons, make them all active
Change to dev/develop parameters
Merge pull request #192 from daydreaming-experiment/feature/issue-174-matrix-choice

Feature/issue 174 matrix choice
Merge branch 'develop' into feature/issue-173-results