Merge branch 'master' into develop
user lock/unlock
Merge branch 'develop' of github.com:butipanax/logistics_europe into develop