ver14
ver15
Merge branch 'PawelNewMerge'

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