set up application for static ip
Merge remote-tracking branch 'origin/master'