Added some code from team witch work on release 2.
Merge branch 'master' into release_2
Implemented table showing.