commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	nbproject/private/private.xml
Merge branch 'master' of https://github.com/infotechnab/Reservation

Conflicts:
	application/helpers/send_email_helper.php
	nbproject/private/private.xml
Merge branch 'master' of https://github.com/infotechnab/Reservation