moved from XML to HTML, changed model from entity... to site...
Merge remote-tracking branch 'rene/master' into develop