CSS updated for different themes
Merge remote-tracking branch 'origin/master'

Conflicts:
	buymestuff/target/m2e-wtp/web-resources/META-INF/maven/uk.ac.dundee.computing.aec.buymestuff/buymestuff/pom.properties