SFDC hacks
Merge branch 'master' of https://github.com/hardik-panchal/wakeup

Conflicts:
	instance/front/tpl/multi_quote.js.php
SFDC