-
Merge branch 'master' of github.com:matttbe/SIT

Conflicts:
	website/Solidare-IT-g6/app/views/services/_share.html.erb
Merge branch 'master' of github.com:matttbe/SIT
Merge branch 'master' of github.com:matttbe/SIT
historic panel
Merge branch 'master' of github.com:matttbe/SIT

Conflicts:
	website/Solidare-IT-g6/app/views/layouts/_usermenu.html.erb