support for zeemote plugin
Merge branch 'master' of git://github.com/nobnago/Anki-Android into zeemote_plugin

Conflicts:
	res/values-fa/06-statistics.xml
	src/com/ichi2/anki/AnkiDroidApp.java
Merge branch 'master' of git://github.com/nicolas-raoul/Anki-Android into zeemote_plugin
further fix for latex, issue 1368
Merge branch 'master' of github.com:iniju/Anki-Android into zeemote_plugin

Conflicts:
	res/values-fa/06-statistics.xml
	src/com/ichi2/anki/StudyOptionsFragment.java
Merge branch 'master' of github.com:iniju/Anki-Android into zeemote_plugin

Conflicts:
	res/values-fa/06-statistics.xml
	src/com/ichi2/anki/StudyOptionsFragment.java
Merge branch 'master' of github.com:iniju/Anki-Android into zeemote_plugin
fix multiline comments
outcomment logs
bump version 2.0
uncomment logs
fixed catalan localization
change icons back to blue
add icon svg
Merge branch 'android_market_2.0'
change icons back to red (needs to be undone before releasing 2.1)

Revert "change icons back to blue"

This reverts commit 6c275b8b69220949df3b625415dd5403a75087fe.
bump version to 2.1alpha0
version 32
clear newfeatures list
localisation