Merge upstream/master into local master
Conference: add companion object
Figure: add companion object
Merge branch 'development'
Abstract: add companion object
Merge pull request #10 from stoewer/master

Add companion objects for model classes