added new sql database generation script
removed debugging messages
added Android gen folder to .gitignore
fixed merge conflict