Major Changes in the model
Merge branch 'master' of https://github.com/eppic-team/eppic-wui.git