manually merge #10
manually merge #10

mirceaalexandru/seneca-web,kristianmandrup/seneca-web,geek/seneca-web,mirceaalexandru/seneca-web,kristianmandrup/seneca-web,R9Gateway/payroutes,wprl/seneca-web,wprl/seneca-web,faceleg/seneca-web,R9Gateway/payroutes,faceleg/seneca-web,faceleg/seneca-web,wprl/seneca-web,senecajs/seneca-web,rjrodger/seneca-web,rjrodger/seneca-web,geek/seneca-web