move to assets folder so users don't download
Merge branch 'develop'