integrated form into single view
Merge branch 'master' of github.com:gonecase/colloquy_new