Latest Changes to shotgun
Revert "Latest Changes to shotgun"

This reverts commit c623349ba3c640947be77f3aafe784f537484d59.
Merge branch 'develop' of https://github.com/vox-populi/off-da-railz into develop