cleanup
Merge branch 'dev' of https://github.com/melki/nodemoti into dev

Conflicts:
	public/js/list.js