Templates for different users
Merge branch 'master' into youssefBranch

Conflicts:
	resources/templates/layout.html
Merge branch 'master' into youssefBranch