updated fabfile
Merge branch 'develop'
fixed static path
Merge branch 'develop'