ignore the bin directory when uploading
Merge branch 'master' into advanced