fixed model changes
Merge branch 'master' of github.com:asobolev/GCA-Web
added draft of the Conference serializer test