...
Merge branch 'develop' of https://github.com/jknyou/doProject into develop

Conflicts:
	.gitignore
	build.gradle
	src/main/java/com/ocean/direct/domain/entity/Comment.java
	src/main/java/com/ocean/direct/domain/entity/Product.java