Desktop client changes
Merge branch 'master' of github.com:equimedialtd/funnel-front

Conflicts:
	app/scripts/_clone.js
	app/scripts/main.js
	app/styles/_base.scss
	app/styles/_material.scss
	app/styles/pages/_drivers.scss
	app/styles/pages/_modifications.scss
	app/styles/vendor.scss
	app/templates/pages/payment-annual.hbs
	app/templates/pages/summary.hbs