Merge branch 'master' into hike
Merge branch 'party'
Simple edit comments
Delete comments
Fix context processor
blog: Add blogpost
blog: Add admin.py
hike: Add verbose name
Merge branch 'hike'
party: Add class Meta
blog: Small fix
Merge branch 'master' into blog
Merge branch 'master' into party
party: fix files