Merge pull request #631 from AlexandreToyer/master

Fix typo on doc
Fix #632
Merge pull request #635 from emmanuel-keller/master

Fix #632
Initial implementation of #626
Merge pull request #638 from emmanuel-keller/master

Initial implementation of #626
IMAP4 crawl initial implementation
Mailbox crawler fieldmap implementation
Mailbox crawler implementation
Conflicts:
	src/doc/fr/documentation/API%7Capplication_programming_interface%7C4/API_v2%7CRESTFul (JSON)/.gitignore
Fix javamail conflict.
Fix compilation error
Merge remote-tracking branch 'upstream/master'
Merge pull request #645 from emmanuel-keller/master

Mailbox crawler
Merge remote-tracking branch 'upstream/master'
Missing collection
Fix #646 #647
Conflicts:
	src/main/java/com/jaeksoft/searchlib/ClientCatalog.java
Sync with 1.6
Merge pull request #651 from emmanuel-keller/master

Bug fix and enhancement
Fix nav links
Merge pull request #652 from emmanuel-keller/master

Fix nav links
Improve locking isolation in config.
Conflicts:
	src/main/java/com/jaeksoft/searchlib/config/Config.java