Merge origin/master

Conflicts:
	src/test/java/repository/CategoryRepositoryTest.java