Fixing tags to move to refactored tag control
Merge branch 'master' of github.com:clocklimited/Catfish