Merge branch 'develop'
Merge pull request #1 from PeqNP/develop

Use asynchronous blocks instead of delegate callbacks
Fixed paths when uploading files
Merge branch 'master' into develop