updated
Merge branch 'master' of github.com:emrahayanoglu/modest

Conflicts:
	modest/db/db.py
DB file is merged