Merge pull request #52 from msimoncz/dev

Large Shots -> Jobs / Jobs -> Tags refactoring