Merge branch 'master' into dev
merged master to dev
file keeps getting deleted
again
Merge pull request #940 from nZEDb/master

merge
fixed a few bugs(kaibosh)
oops
Update releases.php
Merge pull request #944 from nZEDb/dev

Dev