t
Merge branch 'master' of https://github.com/jclui/heliport

Conflicts:
	booking/confirmation.html

fixed