[merge]

addons/web/__openerp__.py

addons/web/common/openerplib/openerplib/__init__.py

addons/web/common/openerplib/openerplib/dates.py

addons/web/common/openerplib/openerplib/main.py

addons/web/static/src/css/base.css

addons/web/static/src/js/search.js

addons/web/static/src/js/view_form.js

addons/web/static/src/js/view_list.js

addons/web/static/src/js/view_list_editable.js

addons/web/static/src/js/views.js

addons/web/static/src/xml/base.xml