MBS-5848: Schema changes for creditable attributes
MBS-5848: Allow all descedents of instrument/vocal attributes to have free credits
Merge branch 'mbs-5848' into schema-changes-2013-05-15

* mbs-5848:
  MBS-5848: Allow all descedents of instrument/vocal attributes to have free credits
  MBS-5848: Schema changes for creditable attributes

Conflicts:
	upgrade.sh