Fix mismerge
Update trello_list field in FogBugz case
Merge branch 'develop' of github.com:gbjk/janus into develop