Merge the IMAP and ActiveSync mutation unit tests
Add tests for hierarchical folder sorting
Increase the timeout on test_imap_mutation.js for slow servers
Fix creation of IMAP folders with parents
Make folder sorting obey the folders' hierarchy
Fix a bug in ActiveSync where the fake inbox's server ID to folder ID mapping never got updated.
Fix calls to MailUniverse._deferOp()
Improve folder type heuristics in IMAP by looking at the display name instead of the full path (necessary if folders like Trash are underneath Inbox)
Merge pull request #125 from mozsquib/folder-sort

Bug 829520 - Folder sorting breaks the displayed folder hiearchy
Merge branch 'master' into merge-mutation-tests
Fix IMAP tests
Merge pull request #126 from mozsquib/merge-mutation-tests

Merge the IMAP and ActiveSync mutation unit tests. r=asuth
Merge remote-tracking branch 'upstream/master' into always-refresh-2

Conflicts:
	test/unit/test_mutation.js