Updated announcements week 20-2014
Merge remote-tracking branch 'origin/announcements' into announcements

Conflicts:
	announcements.html