Merge branch 'master' of github.com:celfred/PlanetAlertProfile

Conflicts:
	site/templates/team.php
Merge branch 'master' of github.com:celfred/PlanetAlertProfile