Merge pull request #71 from flokuep/develop

Develop
some client server changes
do not use static ip and pw (android app)