Merge branch 'develop' into release/candidate

* develop:
  add some comments and refacto
  extrenlize templates and css
Merge branch 'release/candidate' into develop

* release/candidate: