commit modified database generator
Merge branch 'master' of github.com:c4mprod/ContentProviderCodeGenerator

Conflicts:

generator/src/com/foxykeep/cpcodegenerator/generator/DatabaseGenerator.java

version with ON CONFLICT IGNORE