Implement content history for com_tags.
Merge branch 'master' into history-tags

Conflicts:
	administrator/components/com_tags/views/tag/view.html.php
Add version history to user notes and user notes categories.
Merge branch 'master' into history-user-notes
Merge branch 'master' of https://github.com/joomla/joomla-cms into history-tags

Conflicts:
	administrator/components/com_tags/models/forms/tag.xml
	administrator/components/com_tags/views/tag/tmpl/edit.php
	installation/sql/mysql/joomla.sql
Merge branch 'master' of https://github.com/joomla/joomla-cms into history-user-notes
Merge remote-tracking branch 'joomla/pr/2178'
Merge remote-tracking branch 'joomla/pr/2179'