Merge branch 'master' into develop
Added integration to NHB database
Added info a shooter
Merge branch 'develop'