ready for sunday hangouts
space
sunday hangouts
Merge branch 'sunday-hangouts'

Conflicts:
	src/website/src/app/home/home.tpl.html