Changed some settings for deployment
Merge remote-tracking branch 'origin/master'
Commit at first LIVE stage.