fixed some issues
Merge branch 'master' of https://github.com/toop/TopBI

Conflicts:
	database.py