cooomit
Merge branch 'master' of https://github.com/infotechnab/Reservation

Conflicts:
	application/views/template/reservation_template.php
	nbproject/private/private.xml