Fix regenerate crashing server
Merge branch 'development' of http://github.com/mangosvb/serverZero into development