working on announcement and events
Merge branch 'staging' of https://github.com/Daskul/TSUPESO into staging

Conflicts:
	WebUI/Controllers/EventController.cs
	WebUI/Views/Announcement/Edit.cshtml
	WebUI/Views/Event/Edit.cshtml
	WebUI/Views/Event/Post.cshtml
	WebUI/Web.config