# Conflicts:
#	pom.xml
#	src/main/java/com/itsol/quantrivanphong/access/homepage/controller/NewsController.java
#	src/main/java/com/itsol/quantrivanphong/model/Project.java
#	src/main/resources/application.properties