And everything was right with the world

All updates are merged on master branch, database model fully updated