no message
no message
Merge branch 'master' of https://github.com/quxiz/ebid

Conflicts:
	src/main/java/com/se/ebid/controller/ComplaintController.java
	src/main/java/com/se/ebid/controller/EditPersonalInfoController.java
	src/main/java/com/se/ebid/controller/GiveFeedbackController.java
	src/main/java/com/se/ebid/controller/RegisterController.java
	src/main/java/com/se/ebid/controller/RegisterItemController.java
	src/main/java/com/se/ebid/controller/SolveComplaintController.java
	src/main/java/com/se/ebid/controller/ViewItemController.java
	src/main/webapp/WEB-INF/views/showView.jsp