Merge pull request #1 from SindreSvendby/master

Bad state,
Bootsrapping the app
removed 0.0.0 ip
Fixed conflict
Merge branch 'risto1913-master'