merging
Merge branch 'master' of github.com:encorelab/CommonKnowledge
UI changes to accomodate more tags
Merge branch 'master' of github.com:encorelab/CommonKnowledge
reverting UI back to only gracefully handling 5 buttons for btagging