fix merge issue
Merge branch 'develop' into gui-restructure
Merge branch 'develop' into gui-restructure
Merge remote-tracking branch 'origin/develop' into gui-restructure
nothing
style - placeholder login menu
style - placeholder login menu
style - input types
welcome page - startpage - styles - clean up
styles - diverse clean up - renaming base styles
style - renaming
new file for documentation of style name changes
further documentation of style changes
revision of welcome page
further documentation of style changes
new search menu styles - new icons - imj_iconset
header styles
header styles
clear test
header styles - template