Use density independent text size for simple interface, remove unnecessary simplification step
Merge pull request #71 from flerda/v2.1-fontsize

Improvements to simple interface.
Do not use onCancelled with result.

The overloading that takes a result has been introduced in API Level 11
and therefore this causes a crash on previous version.

The default implementation is to simply call the version that does not
have a result, so we can use that instead. None of our code should
depend on the former version anyway, since we cannot guarantee it will
be called.

Issue: https://code.google.com/p/ankidroid/issues/detail?id=1769
Merge pull request #82 from flerda/v2.1-android1.6

Do not use onCancelled with result.
Remove tags instead of replacing with spaces.

See:
https://github.com/dae/anki/commit/3326254eec2ac80eea2fc3d4b4552963db4832ed

fix cloze+latex issue in media check, and duplicate answers (#757, #758)

We were replacing spans with spaces during review but not during media check.
just strip the tags instead, which makes the media check consistent and
doesn't result in multiple identical answers.
Replace &nbsp; with spaces within stripHTML.

See:
https://github.com/dae/anki/commit/2ba8c41fec6f8abf86efdab3ae985e967f0a8bc6

replace nbsp with standard space when stripping html

fixes https://anki.tenderapp.com/discussions/ankidesktop/1952-duplicate-not-detected-on-paste
Do not remove tags as stripHMTL already does that.

See:
https://github.com/dae/anki/commit/988fc102d803f4c8b6d52640536f6a24d3bc696d

remove redundant regex in latex code
Merge pull request #83 from flerda/v2.1-latex

Updates to LaTeX code.
Switch to original note editor.

The multimedia note editor needs a bit more work before it is ready for
release. This commit switches back to the original note editor, so that
we can release a bug-fix version of the application without having to
wait until the multimedia note editor is ready.

It also removed the RECORD_AUDIO permission, since it is not needed if
the multimedia note editor is not used.
Merge pull request #84 from flerda/v2.1-editor

Switch to original note editor.
Update to the latest version of Android.

This commit updates the AndroidManifest.xml to target the latest SDK:
this prevents compatibility behavior on latest version of the OS.

Moreover, update the tools used by Travis CI to the latest and greatest.

Finally, make the download a bit let verbose and easier to debug.
Merge pull request #85 from flerda/v2.1-target-sdk

Update to the latest version of Android.
Added option for relatively scaling images
Merge pull request #88 from adrek14/v2.1-dev-relative-image-size

Added option for relatively scaling images
Kanji Info for Ankidroid! Second version.
Merge pull request #96 from rabite0/v2.1-dev

Kanji Info with copyright notice
Improve Aedict integration

When Adding card via Aedict intent, automatically add meaning
information when avaliable. Before it was only adding the
reading(hiragana) and the word in kanji. With this new functionality, if
the user model has at least 3 fields, extra information will be added
(meaning/reading/kanji).
Merge pull request #99 from diogovk/stable

Improve Aedict integration.
Merge remote-tracking branch 'upstream/v2.1-dev' into v2.1-dev