changes
Merge branch 'master' of https://github.com/TeamPalmTree/teampalmtree

Conflicts:
	config
	config/config.php