changed timestamp for timeout
Merge branch 'master' of https://github.com/dabamos/openadms into intergeo
Merge branch 'intergeo' of https://github.com/dabamos/openadms into intergeo