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
Merge branch 'zeemote_plugin' of https://github.com/iniju/Anki-Android