Filldb edit
Merge branch 'master' of github.com:JelteF/bottor

Conflicts:
	tracker/fill_db.py