still working on small bug in upload....
Merge branch 'master' of http://github.com/AdrianRMazur/newClient