added all changed files
Merge branch 'develop' into staging