updated fabfile methods pull/push_media
Merge branch 'project_template' into develop
update nginx template
update template
updated master template