JSON validate
Merge branch 'master' of https://github.com/Beeline-Digital/TownHallApp

Conflicts:
	www/templates/timetable.html