Merge branch 'master' of https://github.com/DeDieter/wba_team_4

Conflicts:
	Torganizer/public/index.html
	Torganizer/public/tpost.html