ni
Merge remote-tracking branch 'origin/master'

Conflicts:
	kemika-root/kemika-commons/kemika-commons-services/src/test/java/com/kemika/commons/services/CategoryServiceTest.java