update
Merge branch 'master' of http://github.com/vnsofthe/odoo-dev

Conflicts:
	Genetalks/Genetalks.xdk