Fix card editing issues

See [mailing list](https://groups.google.com/forum/#!topic/anki-android/fcZKpj1hWRw).

https://github.com/ankidroid/Anki-Android/pull/238 introduced a new `saveNote` method that my pull requests were not based on, resulting in merge conflicts.