some changes
Merge branch 'master' of github.com:bellcom/odsherred_intranet_deploy