commit
Merge branch 'dev' of https://github.com/realjade/shanlan-node into dev

Conflicts:
	routes/profile.js