merge conflict resolved within ticket model
further merge conflict resolved with ticket
further bug fixes for seed file and models for association testing
Merge pull request #13 from bumblebees-2014/controller_logic

debug seed file according to professional/ticket updates in migration