take precautions to prevent issue #365
added MATCHES
added --progress option for arangoimp. make arangod show import errors
some documentation about --progress option
Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.2