removed unused attributes from category
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	doc/database_structure.sql
	src/php/model/Category.class.php
refactoring abstractService