dropdown
småsaker
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/views/admin.html
	public/views/navbar.html
	public/views/projekt.html
	server/controllers/home.js
abc