RM
Merge branch 'master' of https://github.com/flake79936/eventprobe

Conflicts:
	banner.php
	db.php
	events.php
	map.php
	myevents.php