added fm.configJson method
added startupPath value to result of /_api/foxx/config
fixed Doxygen errors
fixed jslint warnings
updated CHANGELOG
fixed typos in windows parts
added missing encoding
added missing db prefix
fixed issue #734: foxx cookie and route problem
fixed compile warning
fix indentation
added fm.rescan() method
Merge branch '1.4' of https://github.com/triAGENS/ArangoDB into 1.4
updated documentation
issue #736: AQL function to parse collection and key from document handle

Conflicts:

	CHANGELOG
slightly updated error messages
some more notes on importing edges and attribute meanings
release version 1.4.6
updated import manual