MBS-7551: Add folksonomy tag support to areas, instruments, and series
Merge branch 'schema-change-2014-q4' into mbs-7551

Conflicts:
	admin/sql/updates/schema-change/21.slave.sql
	admin/sql/updates/schema-change/21.standalone.sql
	root/area/header.tt
	root/instrument/header.tt
	root/series/header.tt
	upgrade.json
Remove unnecessary sub _table
s/tags-tags/ratings-tags/g
Merge branch 'schema-change-2014-q4' into mbs-7551

Conflicts:
	admin/sql/updates/schema-change/21.slave.sql
	upgrade.json
Merge remote-tracking branch 'bitmap/mbs-7551' into schema-change-2014-q4

* bitmap/mbs-7551:
  s/tags-tags/ratings-tags/g
  Remove unnecessary sub _table
  MBS-7551: Add folksonomy tag support to areas, instruments, and series

Conflicts:
	admin/sql/updates/schema-change/21.slave.sql
	admin/sql/updates/schema-change/21.standalone.sql
	upgrade.json