Changes to DB
Merge branch 'dev' of https://github.com/FitroApp/Kiwi into dev

Conflicts:
	db.js