Merge origin/origin into origin

Conflicts:
	nbproject/project.properties
Merge origin/origin into origin
Merge origin/origin into origin

Conflicts:
	nbproject/project.properties
Merge origin/origin into origin
Added field set to review page. For better look
Added field set to review page. For better look
Added field set to review page. For better look
Added field set to review page. For better look
Review and Booking edit done
Review and Booking edit done