Change listening port from 5000 to 8080
Merge branch 'develop'