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