merge trunk
Moved http.py to server
merge trunk
Enabled controllers not contained in modules
[REM] remove useless warning in user preference
Merge branch 'master' of bzr::lp:openobject-server