Templates for different users
Merge branch 'master' into youssefBranch

Conflicts:
	resources/templates/layout.html
Merge branch 'master' into youssefBranch
Merge branch 'master' into user-type-in-session
user-type
:user-type is now :user-functions