Merge pull request #2 from nZEDb/dev

nzedb/nzedb dev to dariusIII/nzedb dev
Merge pull request #4 from nZEDb/dev

jdev to ddev
Merge pull request #6 from nZEDb/dev

Dev
Merge pull request #8 from nZEDb/dev

jdev to ddev
Merge pull request #10 from nZEDb/dev

jdev to ddev
Merge pull request #12 from nZEDb/dev

jdev to ddev
Merge pull request #13 from nZEDb/dev

jdev to ddev
Merge pull request #15 from nZEDb/dev

jdev to ddev
Merge pull request #18 from nZEDb/dev

jdev to ddev
Merge pull request #21 from nZEDb/dev

jdev to ddev
Merge pull request #23 from nZEDb/dev

jdev to ddev
Merge pull request #24 from nZEDb/dev

jdev to ddev
Merge pull request #27 from nZEDb/dev

jdev to ddev
Merge pull request #28 from nZEDb/dev

jdev to ddev
Merge pull request #29 from nZEDb/dev

jdev to ddev
Merge pull request #30 from nZEDb/dev

jdev to ddev
Merge pull request #31 from nZEDb/dev

jdev to ddev
Merge pull request #33 from nZEDb/dev

jdev to ddev
Merge pull request #34 from nZEDb/dev

jdev to ddev
Merge pull request #36 from nZEDb/dev

jdev to ddev