fix sync error message bug
Revert "add a hack to prevent double newlines when deleting formatting"

This reverts commit ecf9776f905d3ced3fff7c5288646b03258d3f73.
Revert "need to strip trailing <br /> when saving fields"

This reverts commit f10b336fb9db00b038dcaa5e4e2372b9959fa0de.
Revert "force webkit to output <br> when enter pressed, instead of div"

This reverts commit e63c8e56193ef06cf92e8a4a22ce36106f2c2e4c.
catch errors trying to determine fs type
bump version
Merge remote-tracking branch 'dae/master' into feature-flake

Conflicts:
	anki/media.py
	aqt/__init__.py
Reword comment. Return False rather than None, import on two lines.
Merge branch 'feature-flake' into develop-flake
Merge remote-tracking branch 'ospalh/develop-flake' into develop-ospalh-special