ticketing changes
Merge branch 'develop' of github.com:jingar/victory_lies_ahead into develop