Merge branch 'master' into PawelNew
ver12
ver12
Maintain Categories updated
Merge branch 'PawelMerge'

Conflicts:
	src/com/group8/model/DataQueries.java