Merge upstream/master into local master
Conference: add companion object
Figure: add companion object
Merge branch 'development' of github.com:stoewer/GCA-Web into development