working on edit of room info
Merge branch 'master' of https://github.com/infotechnab/Reservation

Conflicts:
	nbproject/private/private.xml