fix in broken farsi localisation
Merge branch 'master' of git://github.com/nicolas-raoul/Anki-Android

Conflicts:
	res/values-fa/06-statistics.xml
further fix for latex, issue 1368
localisation
catching up on libanki
fix farsi string
farsi stirng
forgot something
remaining libanki stuff
issue 1479
fix bug 3618135
be more precise on delete cram deck dialog
fix for card browser counts issue 1475
fix for issue 1335
Updated string (sync-login)

Issue 1423. Updated swedish and english text from "username" to "epost
address"
Merge branch 'master' of https://github.com/packlnd/Anki-Android
Test to see if line-ending is fixed
Fixed problem with having space in decknames.

Regex removed all spaces in the string. See issue 1386
Merge remote-tracking branch 'upstream/master'
start custom study