Moving the login router up so it will work just fine again
Add marked package to support markdown in content editor
Merge branch 'test-editor'

Conflicts:
	lib/router.js