Merge branch 'master' of D:\work\afrishop-refactored-project with conflicts.

src/main/resources/application.properties

 server.servlet.context-path=/zion
 spring.jpa.hibernate.ddl-auto=update
 server.port=8083
-spring.profiles.active=dev
+spring.profiles.active=prod
 #spring.datasource.url=jdbc:mysql://${MYSQL_HOST:localhost}:3306/afrishop_test?useUnicode=true&connectionCollation=utf8mb4_general_ci&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC
 #spring.datasource.username=root
 #spring.datasource.password=Diaoyunnuli.8