Include the right module on image template
Moved config.scss to general.scss + moved @font-size to core/misc
Merge remote-tracking branch 'upstream/master'