Fixes #23

Fixes mongodb issue
Merge branch 'dev'

Conflicts:
	app.js