Merge branch 'master'

Conflicts:
	components/com_content/models/article.php
	components/com_content/models/articles.php
Adding new plugin to database