Release openerp6.1-rev2014011500
Merge branch 'release_openerp6.1-rev2014011500' into dev