added upload functionality
added upload functionality
added upload functionality
added upload functionality
added upload functionality
removed target
Merge branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/jsp/hotel_detail_form.jsp
	target/classes/com/hotel/controller/HotelController.class
	target/classes/com/hotel/converter/HotelDetailConverter.class
	target/hotel-0.0.1-SNAPSHOT.war
	target/hotel-0.0.1-SNAPSHOT/WEB-INF/classes/com/hotel/controller/HotelController.class
	target/hotel-0.0.1-SNAPSHOT/WEB-INF/classes/com/hotel/converter/HotelDetailConverter.class
	target/hotel-0.0.1-SNAPSHOT/WEB-INF/jsp/hotel_detail_form.jsp
	target/maven-archiver/pom.properties