Fix android build with ektorp dependency and copy of web files dependency.
Adding comment to proxy desktop regarding directories for debugging.
Merge remote-tracking branch 'origin/master'