ver14
merge1
Merge branch 'PawelNewMerge'
fixed conflicts
ver14
conflicts fixed
Moved Jtable to view
fixed conflicts to master
fixed port number
ver15
Merge branch 'PawelNewMerge'

Conflicts:
	src/com/group8/controller/Controller.java
	src/com/group8/view/MaintainPanel.java
conflicts fixed