provide debug info when collection corrupt
Merge pull request #83 from sobjornstad/master

various changes from soren
Merge branch 'master' of github.com:dae/anki
new media syncing protocol

- media syncing no longer locks the account, so it can be done
  in the background in the future, and multiple clients can safely
  sync media at the same time
- all operations are now idempotent, so they can be repeatedly safely
  in the event of a connection error
- whether it's a normal incremental sync, an initial sync,
  or the media database has been deleted, no files will be uploaded
  or downloaded if they already exist on the other side
- file removals are now chunked like additions & updates, preventing
  timeouts due to large requests
- if the server can't process a chunk in time, it will return a count
  of what it did process, so the client can retry the rest

Notes for AnkiDroid:

- when porting this, recommend you pick a different name for the
.media.db2 file, so users don't accidentally copy the AD version to
the desktop or vice versa
- please make sure filenames are added to the zip in NFC form
fix handling of corrupt collections on windows

- advise user to create new profile, which prevents restores from
  backup overwriting old backups
- don't rename the collection file, as it's no longer necessary,
  and it fixes a windows bug where the main window would be left
  open due to a failure to rename the locked collection file
Reduce margin of search box so that text isn't covered by fav button
if media.db import fails, start anew
Merge branch 'master' of https://github.com/hssm/anki
Merge branch 'master' of git://github.com/sobjornstad/anki into sobjornstad-master

Conflicts:
	anki/exporting.py
Merge branch 'sobjornstad-master'
initial zip check should display same zip error message
Merge branch 'master' of https://github.com/sobjornstad/anki
Merge branch 'master' of https://github.com/sobjornstad/anki
make sure users can unload corrupt collection to create new profile
add support for ideographic space in card search browser
Merge branch 'master' of https://github.com/sobjornstad/anki
Merge pull request #85 from bastik/ideographic-space

add support for ideographic space in card search browser
must commit on concurrent update
log mediaChangesZip()
force media resync on deauth