Fix migraiton issue with short_description
Merge branch 'filter_tabs' of https://github.com/Colinsmix/twig
Merge branch 'master' of https://github.com/jmoon90/twig