Merge branch 'master' of github.com:bwrsandman/openerp-travel