SubCategoryModel added plus
someChanges v_1
Merge branch 'master' into testMarge

Conflicts:
	src/com/group8/controller/Controller.java
	src/com/group8/model/MainModel.java
	src/com/group8/model/TemporaryDataBaseClass.java
ver_2
ver2
oo.
ver_3
ver_4
ver_5
Merge branch 'master' into PawelNew

Conflicts:
	src/com/group8/model/MainModel.java
ver_6
ver_7
Merge branch 'master' into PawelNew

Conflicts:
	src/com/group8/model/MainModel.java
ver_8
Update DataUpdates.java
Update DataUpdates.java
ver_9
ver_9
Update DataUpdates.java
Update DataUpdates.java