Lun 368

linked also with LUN-368 on django-cms-dbtemplates and LUN-368 on lunchbox