Moved Jtable to view
fixed conflicts to master