urls + handlers refactor
haproxy
Merge remote-tracking branch 'origin/master'