rmeoved deprecated code
Merge branch 'jag/modelviewcontroller-json' of github.com:Zentyal/zentyal into modelviewcontroller-json