Updates to the database model
Merge branch 'master' of https://github.com/Iainzor/Bliss

Conflicts:
	database.mwb