Merge branch 'master' of github.com:crazyuploader/bombsquad-docker