added static root and static files directory
Merge branch 'develop'