added static asset directories, I think
fixing static serving of assets
Merge branch 'develop' into staging