reduce white space
change application id
Merge branch 'master' into deployment/production