Lock changes
Merge branch 'dev.expressdecor' of github.com:expressdecor/Expressdecor into stage.expressdecor
redirect fixes
Merge branch 'dev.expressdecor' of github.com:expressdecor/Expressdecor into stage.expressdecor