Added conform and model columns
Merge branch 'master' of https://github.com/edenduthie/palsweb