Merging things
Catch up
Fix contact model to match master
Updates to language files and joomla.sql
Add access check to JLayout for tags
Fix for no results in view
Deal with merge conflict
Merge remote-tracking branch 'upstream/tagscc' into tagscc

Conflicts:
	libraries/cms/tags/tags.php