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

Conflicts:
	addons/jasper_reports/JasperReports/JasperServer.py
	addons/jasper_reports/jasper_report.py