Issue 1964: Fix crash when using "Saved data" list while adding notes
Merge branch 'develop' of https://github.com/Prom42/Anki-Android into develop

Conflicts:
	src/com/ichi2/anki/CardEditor.java