Bug Fix: orthographical error
Bug fix: too many new lines in arango shell are removed
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

Conflicts:
	Installation/Windows/Templates/NSIS.InstallOptions.ini.in
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel