adding user role
Merge branch 'master' of https://github.com/franckbirba/foliom
finished user creation
Merge branch 'master' of https://github.com/franckbirba/foliom

Conflicts:
	client/templates/nav/nav.html
	client/templates/playground/playground.html
	lib/router.js
	server/publish.js
Revert "Merge branch 'master' of https://github.com/franckbirba/foliom"

This reverts commit b95d6a2a6d1bf3ce256faa3af649afb0db8b63ad, reversing
changes made to de1c5c4d4eb0a79d4db7f98b01a2290b83381b58.
Revert 150d959..00ccfe8

This rolls back to commit 150d95945525f37c6deb3241bc33191e66c90822.
Revert de1c5c4..80180df

This rolls back to commit de1c5c4d4eb0a79d4db7f98b01a2290b83381b58.
merge done