[MERGE] forward porting fixes from saas-3

author Frédéric van der Essen <fva@openerp.com>

Mon, 10 Feb 2014 15:56:28 +0000 (16:56 +0100)

committer Frédéric van der Essen <fva@openerp.com>

Mon, 10 Feb 2014 15:56:28 +0000 (16:56 +0100)
author Frédéric van der Essen <fva@openerp.com>
Mon, 10 Feb 2014 15:56:28 +0000 (16:56 +0100)
committer Frédéric van der Essen <fva@openerp.com>
Mon, 10 Feb 2014 15:56:28 +0000 (16:56 +0100)
diff --cc addons/website/static/src/js/website.tour.banner.js
Simple merge
diff --cc addons/website/views/website_templates.xml
Simple merge
author	Frédéric van der Essen <fva@openerp.com>
	Mon, 10 Feb 2014 15:56:28 +0000 (16:56 +0100)
committer	Frédéric van der Essen <fva@openerp.com>
	Mon, 10 Feb 2014 15:56:28 +0000 (16:56 +0100)
		1	2
addons/website/static/src/js/website.tour.banner.js	patch \|	diff1 \|	diff2 \|	blob \| history
addons/website/views/website_templates.xml	patch \|	diff1 \|	diff2 \|	blob \| history