Merge pull request #15 from zelgerj/master

refactored app upload, shim-it ant target
refactored server waiting