fix #59
Merge branch 'master' of https://github.com/arqex/mongo-on-node

Conflicts:
	server/controllers/apiDocument.js