Merge branch 'master' into frontend
commit after holiday break
Merge branch 'master' into frontend
final touches on blog list, blog post, single event
Merge branch 'frontend'