settings and expert search
settings and expert search
GUI Changes
Merge branch 'master' of github.com:tanskanm/metka

Conflicts:
	metka_theme/html/materialView.html
	metka_theme/html/publicationView.html
	metka_theme/sass/navigation.scss
	metka_theme/stylesheets/styles.css
Merge pull request #47 from tanskanm/master

Lots of gui changes