some fixes in generateSwagger
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
GraphViewer: Test for default behaviour of zooming
GraphViewer: Further tests for default behaviour of zooming
GraphViewer: Implemented ZoomManager
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
GraphViewer: Design optimization
GraphViewer: Adapted spec for UI refinement
swagger documentation for api-grap.js
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
GraphViewer: Further UI refinement
swagger documentation for api-edges.js
typo fix
Update Foxx documentation
Merge pull request #496 from fhemberger/devel

Update Foxx documentation
The comment for the method reserve() was wrong (it was copied from the method annihilate()).
Implemented function for shutting down the statistics.
The new function is called by ShutdownRest() and releases the memory allocated by TRI_InitialiseStatistics().
In the functions TRI_VerifyLockFile (Linux and Windows), the buffer 'buffer' was initialized to 0 right before calling TRI_UInt32String(), making TRI_UInt32String() return always 0, instead of the PID.
Merge pull request #499 from guidoreina/experiment

Minor changes
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel