Transferred static content to database
Merge branch 'develop'