xml for table and ...
Merge branch 'master' of https://github.com/Reyhaneh-Ameri/software-engineering2-GroupB