[MERGE] Replace inherit_option_id by a selection field (PR #229)

addons/website/controllers/main.py

addons/website/models/ir_ui_view.py

addons/website/static/src/js/website.ace.js

addons/website/static/src/js/website.editor.js

addons/website/views/themes.xml

addons/website/views/website_templates.xml

addons/website_blog/views/website_blog_templates.xml

addons/website_crm/views/website_crm.xml

...e_crm_partner_assign/views/website_crm_partner_assign.xml

addons/website_customer/views/website_customer.xml

addons/website_event/views/website_event.xml

addons/website_event_sale/views/website_event_sale.xml

addons/website_event_track/views/website_event.xml

addons/website_hr/views/website_hr.xml

addons/website_hr_recruitment/views/templates.xml

addons/website_membership/views/website_membership.xml

addons/website_quote/views/website_quotation.xml

addons/website_sale/views/templates.xml

openerp/addons/base/ir/ir_ui_view.py

openerp/addons/base/tests/test_views.py