Merge branch 'develop' into feature/mobile-navigation

Conflicts:
	library/css/style1.css
Conditionally activate superfish in thematic.js
Reorder enqueuing of javascripts

Enqueue thematic.js last
Do not enqueue thematic-dropdown script
Move superfish javascript to /js/ directory, delete old /scripts/ directory