Search on Enter key.
Merge pull request #1 from agrueneberg/searchbox

Search on Enter key.

Fixes issue 1510.
https://code.google.com/p/ankidroid/issues/detail?id=1510

Tested: on Nexus 4 / Jelly Bean
Merge branch 'v2.0.1-dev' into v2.1-dev

* v2.0.1-dev:
  fix for bug 3640075
  fix importing bug (models where wrongly recognized as being corrupt)
  version 31
  add icon svg
  change icons back to blue
  fixed catalan localization
Issue 1248 - Fix delete dialog
Merge pull request #10 from ntsp/Issue1248

Issue 1248 - Fix delete dialog
Insert class attribute for card-specific styling
Merge pull request #15 from ntsp/Issue1246

Insert class attribute for card-specific styling
Merge branch 'v2.0.1-dev' into v2.1-dev

* v2.0.1-dev: (32 commits)
  strip leading and trailing spaces from email in login/register and disallow suggestions in login
  setmod when doing a full sync that didn't originate from conflict (ie after sync fail sanity check), also some formatting and extra checks.
  follow Kosta's advice regarding RemoteMediaServer --> exception is catched and a report is filed anyway
  fix issues with clozes and <% %> (dae/anki 0447cb4f4)
  don't indiscriminately modSchema on db check (dae/anki e9b24f9f3)
  preserve image filenames when stripping html (dae/anki 8cf072c73)
  spread reviews before sibling check (dae/anki 26ae5e1c47)
  allow browser font customization on a per-template basis (dae/anki d11a1e0d5) - Only the models default template is touched, the browser font is selected elsewhere in AD and doesn't follow the model currently.
  import descriptions in parent decks (dae/anki c6b0945af)
  force full sync when restoring from backup (dae/anki 73f8d1a45)
  reapply failure mult on failures in lrn queue (dae/anki e27cbd2cb)
  strip HTML when calculating field checksum (users will need to checkDB) (dae/anki 2095e5c4b)
  earlier fix for logging new in filt broke logging of non-new in filt (dae/anki f6ff63eeb8)
  typo
  improve handling of divergent models when importing (dae/old-libanki 3ffe47f5d) - Supplementary update adding _mungeMedia function in _importNotes that was missing from previous updates.
  fix importing of latex cache files (dae/old-libanki 6e5233169)
  don't log new cards in filtered deck as cramming (dae/old-libanki c36cc72cb2)
  fix bug when renaming foo::bar foo to new parent (dae/old-libanki 4a00e0427)
  catch missing nids in fixIntegrity() (dae/old-libanki b226675618)
  remove unnecessary save() in sync (dae/old-ankiqt 3e6bb426a)
  ...

Conflicts:
	src/com/ichi2/anki/Reviewer.java
Merge pull request #24 from flerda/v2.0.1-dev

Catch up merge from 2.0.1 into 2.1
Merge pull request #33 from flerda/v2.0.1-dev

Catch up merge from 2.0.1 into 2.1
Merge pull request #2 from flerda/v2.1-dev

Update 2.1 branch from flerda
Fix timeboxing and clean up old session code
Move sync account from menu to preferences
Merge pull request #36 from ntsp/timebox

Fix timeboxing and clean up old session code.
Merge pull request #41 from ntsp/Issue1640

Issue 1640 - Move sync account from menu to preferences
Login preference strings and username check
Merge pull request #42 from ntsp/Issue1640

Issue 1640 - Login preference strings and username check
Merge pull request #43 from flerda/v2.0.1-dev

Catch up merge from 2.0.1 into 2.1
Merge pull request #4 from flerda/v2.1-dev

Catch up merge from flerda into 2.1
Merge pull request #45 from flerda/v2.0.1-dev

Catch up merge from 2.0.1 into 2.1