issue #1173: AQL Editor "Save current query" resets user password

Conflicts:
	CHANGELOG
expose the any() method from the collection on the repository too
Fix bug in the user app's storage
Merge pull request #1177 from triAGENS/fix-user-app

Fix bug in the user app's storage
fixes from feedback
Add 'mergeObjects' description to edge API docs.

Description of 'mergeObjects' parameter was missing in edge update
(PATCH) operation.
Merge pull request #1178 from yojimbo87/devel

Add 'mergeObjects' description to edge API docs.
fixed broken documentation
Merge pull request #1176 from stackmagic/foxx-repo-any

repository.any()
issue: #1161 fixed
issue: #1168
added optional COUNT clause for AQL COLLECT
Optimizer: Enable removing of filternodes if the index can handle the filter condition.
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
changed `COLLECT...INTO x COUNT` to `COLLECT...WITH COUNT INTO x`

allow executing subqueries without double brackets

jslint
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
fixed tests
Fix unittest.
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

Conflicts:
	js/server/tests/aql-optimizer-rule-remove-filter-covered-by-index.js
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into v8-upgrade