Fixes #39: Update inheritance example: Add missing db_session
Merge master to orm