Merge remote-tracking branch 'norbert/android_market_2.0' into v2.0.1-dev
externalized upgrade wizard strings to resources for translation - issue 1580
fixes for upgrade wizard, improved add/replace behaviour for imports (shared decks always added, upgrade imports always replacing)
fix for closing of collections, so that thread counter doesn't get negative
optimized sync media - removing local media in transaction
Merge pull request #23 from iniju/v2.0.1-upgrade-wizard

Upgrade wizard.
Merge pull request #22 from iniju/v2.0.1-sync-media-optimization

Removing local media in transaction.