diff --git a/addons/gamification_sale_crm/sale_crm_goals_demo.xml b/addons/gamification_sale_crm/sale_crm_goals_demo.xml
index fd69c36162f..d8e26551c32 100644
--- a/addons/gamification_sale_crm/sale_crm_goals_demo.xml
+++ b/addons/gamification_sale_crm/sale_crm_goals_demo.xml
@@ -14,7 +14,7 @@
             <field name="user_id" eval="ref('base.user_demo')" />
             <field name="line_id" eval="ref('line_crm_sale1')" />
             <field name="start_date" eval="time.strftime('%Y-%m-01')" />
-            <field name="end_date" eval="time.strftime('%Y-%m-31')" />
+            <field name="end_date" eval="(DateTime.today().replace(day=1)+relativedelta(months=1, days=-1)).strftime('%Y-%m-%d')" />
             <field name="target_goal">2000</field>
             <field name="state">inprogress</field>
         </record>
diff --git a/addons/website/data/website_data.xml b/addons/website/data/website_data.xml
index 50f2d8e381e..4eff1b8a60d 100644
--- a/addons/website/data/website_data.xml
+++ b/addons/website/data/website_data.xml
@@ -59,7 +59,7 @@
         </record>
         <record id="action_website_tutorial" model="ir.actions.act_url">
             <field name="name">Website With Tutorial</field>
-            <field name="url">/?tutorial.banner=true</field>
+            <field name="url">/#tutorial.banner=true</field>
             <field name="target">self</field>
         </record>
         <record id="action_website_homepage" model="ir.actions.act_url">
diff --git a/addons/website/static/src/js/website.tour.banner.js b/addons/website/static/src/js/website.tour.banner.js
index 2c26ae34e98..b079c4a670c 100644
--- a/addons/website/static/src/js/website.tour.banner.js
+++ b/addons/website/static/src/js/website.tour.banner.js
@@ -13,7 +13,7 @@
     website.BannerTour = website.Tour.extend({
         id:   'banner',
         name: "Insert a banner",
-        path: '/page/website.homepage',
+        path: '/',
         init: function (editor) {
             var self = this;
             self.steps = [
@@ -52,9 +52,9 @@
                     placement: 'top',
                     title:     "Customize banner's text",
                     content:   "Click in the text and start editing it. Click continue once it's done.",
+                    template:  self.popover({ next: "Continue" }),
                 },
                 {
-                    waitNot:   '#wrap [data-snippet-id=carousel]:first .carousel-caption:contains("Your Banner Title")',
                     element:   '.oe_overlay_options .oe_options',
                     placement: 'left',
                     title:     "Customize the banner",
diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js
index 39eaa5b7279..1db813e4cd4 100644
--- a/addons/website/static/src/js/website.tour.js
+++ b/addons/website/static/src/js/website.tour.js
@@ -7,10 +7,6 @@ website.add_template_file('/website/static/src/xml/website.tour.xml');
 website.EditorBar.include({
     tours: [],
     start: function () {
-        // $('.tour-backdrop').click(function (e) {
-        //     e.stopImmediatePropagation();
-        //     e.preventDefault();
-        // });
         var self = this;
         var menu = $('#help-menu');
         _.each(this.tours, function (tour) {
@@ -113,11 +109,13 @@ website.Tour = openerp.Class.extend({
             this.localStorage.setItem("tour-"+this.id+"-test-automatic", true);
         }
 
-        // redirect to begin of the tour
         if (this.path) {
-            var path = this.path.split('?');
-            window.location.href = path[0] + "?tutorial."+this.id+"=true" + path.slice(1, path.length).join("?");
-            return;
+            // redirect to begin of the tour in function of the language
+            if (!this.testUrl(this.path+"(#.*)?$")) {
+                var path = this.path.split('#');
+                window.location.href = "/"+this.getLang()+path[0] + "#tutorial."+this.id+"=true&" + path.slice(1, path.length).join("#");
+                return;
+            }
         }
 
         var self = this;
@@ -125,12 +123,12 @@ website.Tour = openerp.Class.extend({
         website.Tour.waitReady.call(this, function () {self._running();});
     },
     running: function () {
-        if (+this.localStorage.getItem("tour-"+this.id+"-test") >= this.steps.length) {
+        if (+this.localStorage.getItem("tour-"+this.id+"-test") >= this.steps.length-1) {
             this.endTour();
             return;
         }
 
-        if (website.Tour.is_busy() || !this.testUrl()) return;
+        if (website.Tour.is_busy() || !this.testPathUrl()) return;
 
         // launch tour with url
         this.checkRunningUrl();
@@ -143,7 +141,6 @@ website.Tour = openerp.Class.extend({
         var self = this;
         website.Tour.waitReady.call(this, function () {self._running();});
     },
-
     _running: function () {
         var stepId = this.localStorage.getItem("tour-"+this.id+"-test");
         var automatic = !!this.localStorage.getItem("tour-"+this.id+"-test-automatic");
@@ -174,13 +171,19 @@ website.Tour = openerp.Class.extend({
         $('.popover.tour').remove();
     },
 
-    testUrl: function () {
-        return !this.testPath || this.testPath.test(window.location.href);
+    getLang: function () {
+        return $("html").attr("lang").replace(/-/, '_');
+    },
+    testUrl: function (url) {
+        return new RegExp("(/"+this.getLang()+")?"+url, "i").test(window.location.href);
+    },
+    testPathUrl: function () {
+        if (!this.testPath || this.testUrl(this.testPath)) return true;
     },
     checkRunningUrl: function () {
-        if (window.location.search.indexOf("tutorial."+this.id+"=true") > -1) {
+        if (window.location.hash.indexOf("tutorial."+this.id+"=true") > -1) {
             this.localStorage.setItem("tour-"+this.id+"-test", 0);
-            window.location.href = window.location.href.replace(/tutorial.+=true&?/, '');
+            window.location.hash = window.location.hash.replace(/tutorial.+=true&?/, '');
         }
     },
 
@@ -315,7 +318,11 @@ website.Tour = openerp.Class.extend({
         }
     },
     endTour: function () {
-        console.log('{ "event": "success" }');
+        if (parseInt(this.localStorage.getItem("tour-"+this.id+"-test"),10) >= this.steps.length-1) {
+            console.log('{ "event": "success" }');
+        } else {
+            console.log('{ "event": "canceled" }');
+        }
         this.reset();
     },
     autoNextStep: function () {
diff --git a/addons/website_blog/data/website_blog_data.xml b/addons/website_blog/data/website_blog_data.xml
index 4eb70186d52..a5a3aa3d8c9 100644
--- a/addons/website_blog/data/website_blog_data.xml
+++ b/addons/website_blog/data/website_blog_data.xml
@@ -20,7 +20,7 @@
         <record id="action_open_website" model="ir.actions.act_url">
             <field name="name">Website Blogs</field>
             <field name="target">self</field>
-            <field name="url" eval="'/blog/'+str(ref('website_blog.blog_blog_1'))+'/?tutorial.blog=true'"/>
+            <field name="url" eval="'/blog/'+str(ref('website_blog.blog_blog_1'))+'/#tutorial.blog=true'"/>
         </record>
         <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="action_open_website"/>
diff --git a/addons/website_blog/static/src/js/website.tour.blog.js b/addons/website_blog/static/src/js/website.tour.blog.js
index 1bd9f22fa31..ffbd6e7ecc8 100644
--- a/addons/website_blog/static/src/js/website.tour.blog.js
+++ b/addons/website_blog/static/src/js/website.tour.blog.js
@@ -13,7 +13,7 @@
     website.BlogTour = website.Tour.extend({
         id: 'blog',
         name: "Create a blog post",
-        testPath: /\/(blog|blogpost)\/[0-9]+\//,
+        testPath: '/(blog|blogpost)',
         init: function (editor) {
             var self = this;
             self.steps = [
diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py
index 17a666cf2e3..fbfb1908a14 100644
--- a/addons/website_crm_partner_assign/controllers/main.py
+++ b/addons/website_crm_partner_assign/controllers/main.py
@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 
+import werkzeug
+
 import openerp
 from openerp import SUPERUSER_ID
 from openerp.addons.web import http
 from openerp.tools.translate import _
 from openerp.addons.web.http import request
 from openerp.addons.website_partner.controllers import main as website_partner
-import werkzeug.urls
 
 class WebsiteCrmPartnerAssign(http.Controller):
     _references_per_page = 20
@@ -14,16 +15,25 @@ class WebsiteCrmPartnerAssign(http.Controller):
     @http.route([
         '/partners/',
         '/partners/page/<int:page>/',
+
+        '/partners/grade/<int:grade_id>',
+        '/partners/grade/<int:grade_id>/page/<int:page>/',
+
         '/partners/country/<int:country_id>',
         '/partners/country/<country_name>-<int:country_id>',
         '/partners/country/<int:country_id>/page/<int:page>/',
         '/partners/country/<country_name>-<int:country_id>/page/<int:page>/',
+        
+        '/partners/grade/<int:grade_id>/country/<int:country_id>/',
+        '/partners/grade/<int:grade_id>/country/<country_name>-<int:country_id>',
+        '/partners/grade/<int:grade_id>/country/<int:country_id>/page/<int:page>/',
+        '/partners/grade/<int:grade_id>/country/<country_name>-<int:country_id>/page/<int:page>/',
+        
     ], type='http', auth="public", website=True, multilang=True)
-    def partners(self, country_id=0, page=0, **post):
+    def partners(self, country_id=0, grade_id=0, page=0, **post):
         country_obj = request.registry['res.country']
         partner_obj = request.registry['res.partner']
         post_name = post.get('search', '')
-        grade_id = post.get('grade', '')
         country = None
 
         # format displayed membership lines domain
@@ -83,7 +93,7 @@ class WebsiteCrmPartnerAssign(http.Controller):
             context=request.context, count=True)
         grades.insert(0, {
             'grade_id_count': grades_partners,
-            'grade_id': ("all", _("All Levels"))
+            'grade_id': (0, _("All Categories"))
         })
 
         values = {
diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
index cd06e515a3e..cd2e3cb58bd 100644
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
@@ -35,13 +35,27 @@
                     Contact a reseller
                 </h2>
             </div>
+
             <div class="col-md-4 mb32" id="partner_left">
-                <h3>Resellers by Country</h3>
+
                 <ul class="nav nav-pills nav-stacked mt16">
+                    <li class="nav-header"><h3>Categories</h3></li>
+                    <t t-foreach="grades" t-as="grade">
+                        <li t-if="grade['grade_id']" t-att-class="grade['grade_id'][0] == grade_id and 'active' or ''">
+                            <a t-attf-href="#{ grade['grade_id'][0] and '/partners/grade/%s' % grade['grade_id'][0] or '/partners' }#{ current_country_id and ('/country/%s' % current_country_id) or '' }#{ search_path }">
+                                <span class="badge pull-right" t-esc="grade['grade_id_count'] or ''"/>
+                                <t t-esc="grade['grade_id'][1]"/> 
+                            </a>
+                        </li>
+                    </t>
+                </ul>
+
+                <ul id="reseller_countries" class="nav nav-pills nav-stacked mt16">
+                    <li class="nav-header"><h3>Locations</h3></li>
                     <t t-foreach="countries" t-as="country_dict">
                         <t t-if="country_dict['country_id']">
                             <li t-att-class="country_dict['country_id'][0] == current_country_id and 'active' or ''">
-                                <a t-attf-href="#{ country_dict['country_id'][0] and '/partners/country/%s' % slug(country_dict['country_id']) or '/partners/' }#{ search_path }">
+                                <a t-attf-href="#{ country_dict['country_id'][0] and ('/partners/country/%s' % slug(country_dict['country_id'])) or '/partners/' }#{ search_path }">
                                     <span class="badge pull-right" t-esc="country_dict['country_id_count'] or ''"/>
                                     <t t-esc="country_dict['country_id'][1]"/> 
                                 </a>
@@ -49,7 +63,9 @@
                         </t>
                     </t>
                 </ul>
+
             </div>
+            
             <div class="col-md-8" id="ref_content">
                 <div class='navbar'>
                     <div>
@@ -60,17 +76,7 @@
                             <div class="form-group">
                                 <input type="text" name="search" class="search-query col-md-2 mt4 form-control" placeholder="Search" t-att-value="searches.get('search', '')"/>
                             </div>
-                            <div class="form-group">
-                                <select class="search-query col-md-2 mt4 form-control" name="grade" t-if="len(grades) > 1" onchange="submit()">
-                                    <t t-foreach="grades">
-                                        <t t-if="grade_id">
-                                            <option t-att-selected="searches.get('grade') == str(grade_id and grade_id[0]) and 'selected'" t-att-value="grade_id[0]">
-                                                <t t-esc="grade_id[1]"/> (<t t-esc="grade_id_count"/>)
-                                            </option>
-                                        </t>
-                                    </t>
-                                </select>
-                            </div>
+
                         </form>
                     </div>
                 </div>
@@ -103,7 +109,7 @@
 </template>
 
 <template id="ref_country" inherit_id="website_crm_partner_assign.index" inherit_option_id="website_crm_partner_assign.index" name="Left World Map">
-    <xpath expr="//div[@id='partner_left']//ul" position="after">
+    <xpath expr="//ul[@id='reseller_countries']" position="after">
         <h3>World Map</h3>
         <ul class="nav">
             <iframe t-attf-src="/google_map/?width=320&amp;height=240&amp;partner_ids=#{ google_map_partner_ids }&amp;partner_url=/partners/"
diff --git a/addons/website_event/static/src/js/website.tour.event.js b/addons/website_event/static/src/js/website.tour.event.js
index c449c4209d1..05de73ceffb 100644
--- a/addons/website_event/static/src/js/website.tour.event.js
+++ b/addons/website_event/static/src/js/website.tour.event.js
@@ -13,7 +13,7 @@
     website.EventTour = website.Tour.extend({
         id: 'event',
         name: "Create an event",
-        testPath: /\/event\/[0-9]+\/register/,
+        testPath: '/event(/[0-9]+/register)?',
         init: function (editor) {
             var self = this;
             self.steps = [
diff --git a/addons/website_event/tests/ui_suite/event_test.js b/addons/website_event/tests/ui_suite/event_test.js
index 12110e11546..06d6dc12b5f 100644
--- a/addons/website_event/tests/ui_suite/event_test.js
+++ b/addons/website_event/tests/ui_suite/event_test.js
@@ -11,7 +11,7 @@ testRunner.run(function eventTest (page, timeout) {
         });
     }, function executeTest () {
         page.evaluate(function () {
-            window.openerp.website.Tour.run_test('event');
+            window.openerp.website.Tour.get('event').run(true);
         });
     }, timeout);
 });
diff --git a/addons/website_sale/data/website_sale_data.xml b/addons/website_sale/data/website_sale_data.xml
index 3658ea7bdc6..c2f9144d7e4 100644
--- a/addons/website_sale/data/website_sale_data.xml
+++ b/addons/website_sale/data/website_sale_data.xml
@@ -16,7 +16,7 @@
         <record id="action_open_website" model="ir.actions.act_url">
             <field name="name">Website Shop</field>
             <field name="target">self</field>
-            <field name="url">/shop?tutorial.shop=true</field>
+            <field name="url">/shop#tutorial.shop=true</field>
         </record>
         <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="action_open_website"/>
diff --git a/addons/website_sale/static/description/index.html b/addons/website_sale/static/description/index.html
index 1e57bf6c23d..f6a9d50443e 100644
--- a/addons/website_sale/static/description/index.html
+++ b/addons/website_sale/static/description/index.html
@@ -27,7 +27,7 @@
 
 <section class="oe_container oe_dark">
     <div class="oe_row">
-        <h2 class="oe_slogan">Create Awsome Product Pages</h2>
+        <h2 class="oe_slogan">Create Awesome Product Pages</h2>
         <h3 class="oe_slogan">Get rid of old WYSIWYG editors</h3>
         <div class="oe_span6">
             <p class='oe_mt32'>
@@ -295,7 +295,7 @@
 
 <section class="oe_container">
     <div class="oe_row">
-        <h2 class="oe_slogan">Fully Integrated With Others Apps</h2>
+        <h2 class="oe_slogan">Fully Integrated With Other Apps</h2>
         <h3 class="oe_slogan">Get hundreds of open source apps for free</h3>
         <div class="oe_span4">
             <a href="/apps/website">
diff --git a/addons/website_sale/static/src/js/website.tour.shop.js b/addons/website_sale/static/src/js/website.tour.shop.js
index ebf5c9d00ec..a141e991661 100644
--- a/addons/website_sale/static/src/js/website.tour.shop.js
+++ b/addons/website_sale/static/src/js/website.tour.shop.js
@@ -14,7 +14,7 @@
     website.EditorShopTour = website.Tour.extend({
         id: 'shop',
         name: "Create a product",
-        testPath: /\/shop\/.*/,
+        testPath: '/shop',
         init: function (editor) {
             var self = this;
             self.steps = [
@@ -145,7 +145,7 @@
         id: 'shop_buy_product',
         name: "Try to buy products",
         path: '/shop',
-        testPath: /\/shop/,
+        testPath: '/shop',
         init: function (editor) {
             var self = this;
             self.steps = [
@@ -217,10 +217,10 @@
                 },
                 {
                     title:     "select acquirer",
-                    element:   'input[name="acquirer"]',
+                    element:   'input[name="acquirer"]:first',
                 },
                 {
-                    title:     "confirm",
+                    title:     "Pay Now",
                     element:   'button:contains("Pay Now")',
                 },
                 {