ignore deploy_to_master script
Merge branch 'develop'