Merge remote-tracking branch 'upstream/master' into feature/json-post
ignore log files
trying to figure out why the service some times won't restart when killed by android
better logging/exception handling; post to 2 endpoints
Merge branch 'feature/json-post' into integration