Initial commit
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Fixed files upload endpoint
Merge branch 'hotfix/2013-11.0.1' into develop