site changes
Merge branch 'master' of https://github.com/Trifectgaming/Trifect-CMS

Conflicts:
	App_Data/Sites/Default/Search.settings.xml