Testing
Merge branch 'devel' into FTR-16-static-and-dynamic-navigation

Conflicts:
	muikku/src/main/webapp/resources/sass/_widgets.scss
Trying to merge from devel
Merge branch 'devel' into FTR-16-static-and-dynamic-navigation
Merge missing JS files to the branch
Merge branch 'devel' into FTR-16-static-and-dynamic-navigation
Tooltips for navigation icons