fix conflict
fix conflict

report empty version string

debug version

debug version

debug version

debug version

debug version

increase acitivity timeout to 600 sec
Merge branch 'develop' of github.com:wgerlach/AWE into develop