merging
Merge branch 'master' of https://github.com/arkona/content
Merge branch 'master' of https://github.com/arkona/content
fixed uploading folder function