Merge branch 'master' into frontend
themed a few more things, can't remember what really, but it must have been about the carousel :)
Merge branch 'frontend'