Merge branch 'master' into frontend
finalising details, reworked homepage and blog.
Merge branch 'frontend'