Merge branch 'hotfix-2.1.2'

* hotfix-2.1.2:
  Bumped version to 2.1.2 @branch-specific
  New features: Fixed TTS
  Instructions for ChangeLog strings
  Added branch specific tag to bumping commit
  Bumped version to 2.1.2beta1 @branch-specific
  Fixed conflicts
  Bumped version 2.1.2beta0
Make background color render properly
Add unbury button to studyoptions layout for tablets to stop crashing
Change order of options for second column
Clean up comments in XML file
Merge pull request #249 from timrae/cardBrowserCustomize

Set background color properly in card browser
Bumped version to 2.2alpha20
@branch-specific
Merge pull request #250 from timrae/unbury_button_fix

Add unbury button to studyoptions layout for tablets to stop crashing
Bumped version to 2.2alpha21
@branch-specific
Configuration for SonarQube static analysis
Update source location.
Merge pull request #251 from agrueneberg/update-source-location

Update source location
Only support audio focus on API level >= 8.
Merge pull request #253 from agrueneberg/fix-audio-focus-compat

Only support audio focus on API level >= 8
Bumped version to 2.2alpha22
@branch-specific
Clean up. Remove trailing whitespaces. Fixed a bit of mojibake.
Merge pull request #254 from ospalh/feature-cleanup-whitespace-mojibake

Clean up. Remove trailing whitespaces. Fixed a bit of mojibake.
Preselect deck for new cards in the same way as Anki Desktop.

Implement both "When adding, default to current deck" as well as "Change
deck depending on note type."
Bumped version to 2.1.3beta1
@branch-specific
new changelog for fix
@branch-specific
Include v7 appcompat library.

Please reimport the project in Eclipse.