[MERGE]: merging from the development branch 2

addons/base_calendar/__openerp__.py

addons/base_calendar/base_calendar.py

addons/base_calendar/base_calendar_data.xml

addons/base_calendar/base_calendar_view.xml

addons/base_calendar/test/base_calendar_test.yml

addons/crm/crm.py

addons/crm/crm_meeting.py

addons/olap/__openerp__.py

addons/olap/data/olap_fact_view.xml

addons/olap/olap.py

addons/olap/test/olap_test00.yml

addons/olap/wizard/olap_load_column.py

addons/survey/__openerp__.py

addons/survey/test/survey00.yml

addons/wiki/__openerp__.py

addons/wiki/test/wiki_test00.yml