$27 컨벤션 수정 필요시 추후 컨버터 제작
Merge branch 'master' into develop

Conflicts:
	src/main/java/database/DatabaseByMysql.java
	src/main/java/type/Inquiry.java
	src/main/java/type/Location.java
	src/main/java/type/User.java
	src/main/java/type/UserProfile.java
	src/main/java/type/Verification.java
	src/main/java/type/Video.java