simplified uwsgi setup
Merge branch '7.0' of https://github.com/odoo/odoo into 7.0
Merge branch '7.0' of github.com:OCA/OCB into 7.0
Added support for sentry logging