Priors as Justin has 'm
Added cequad parameter description
Merge branch 'master' into atlas
Fixed conflict
Changed make-compilation models
Fixed merge conflict