1601
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/software/tour/controller/HotelController.java
	src/main/java/com/software/tour/domain/HotelSpecifications.java
	src/main/webapp/WEB-INF/views/hotels/list.jspx
	src/main/webapp/WEB-INF/views/restaurants/list.jspx