fixed compile warning
added fm.rescan() method

Conflicts:
	CHANGELOG
updated documentation
Added __dirname, __filename pseudo-globals. Fixes #733.
Merge branch 'globals-filename-dirname' of https://github.com/pluma/ArangoDB into devel
small improvement for issue #738
updated CHANGELOG
issue #736: AQL function to parse collection and key from document handle
follow up for issue #738
removed superfluous macro and check
removed invalid conversion
allow direct access from the `db` object to collections whose names start with an underscore (e.g. db._users).

Previously, access to such collections via the `db` object was possible from arangosh, but not from arangod (and thus Foxx and actions). The only way to access such collections from these places was via the `db._collection(<name>)` workaround.
updated CHANGELOG
dont throw exception in v8 property getter
added graph-specific error code
issue #730: initial implementation of A*
slightly updated error messages
some more notes on importing edges and attribute meanings
updated import manual
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding

Conflicts:
	arangod/V8Server/v8-vocbase.cpp