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

Conflicts:
	eventAccor.php
	search.php
	searchForm.php
	userPage.php