develop struct jsp where are table
removed conflict
Merge branch 'master' of https://github.com/SavrukSergiy/dreamhost
Merge branch 'master' of https://github.com/SavrukSergiy/dreamhost