remove comments
added comment
Merge origin/master

Conflicts:
	src/main/java/project/entity/Entity.java
added new comment