Issue #10 - show and hide announcements
Merge branch 'my'

Conflicts:
	templates/index.html
	templates/messages/message.html