organize the vertical header and horizontal header in one table;
Merge branch 'master' of https://github.com/ora-ita-fa/prototype