up
Merge remote-tracking branch 'origin/master' into development

Conflicts:
	components/header/app-header.html
	index.html
	pages/eval/eval-page.html
	server/server.js
Merge
Prepare mail template
Add invitation page
Add some fancy styles
Lookup company details when adding clients
rename service