Revert "Revert "Merge branch 'master' of https://github.com/endosnipe/ENdoSnipe""

This reverts commit 593efffacd843fe96967c695c90526921701c531.