Edited DB Generator and updated DB Contents
Merge branch 'master' of https://github.com/ThePenguin1140/NSO-App