added mountedApp
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel

Conflicts:
	js/server/modules/org/arangodb/foxx/model.js