ste
Merge branch 'master' of https://github.com/hubplanner/API

Conflicts:
	Examples/general/booking.js