Updated database
Changed relation definitions
Merge origin/master