Merge remote branch 'upstream/master'
Merge branch 'andrey' of github.com:asobolev/GCA-Web into andrey
Merge branch 'master' of github.com:asobolev/GCA-Web
Merge branch 'master' into andrey
draft for the conference controller tests
Merge branch 'master' of github.com:asobolev/GCA-Web
tests for Conference written
fixed bug in conference update test
Merge branch 'master' of github.com:asobolev/GCA-Web
Merge branch 'master' into andrey
Merge pull request #44 from asobolev/master

Tests for Conference controller

LGTM