Updated Booking process
Merge branch 'master' of https://github.com/yakunkun/desksurfing

Conflicts:
	js/controller.js
	partials/home.html