Merge Change on Eclipse.
Change again on Eclipse.
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebContent/pages/news/WeekSchedule.html