Update
Merge branch 'master' of https://github.com/oliver204/Reviveaphone-Website

Conflicts:
	CURRENT/splash.php