[t3252] Adding media clips without a protocol shouldn't hang
added nbproject/ to .gitignore
Fix bug 869949 - Update to sequelize v1.6.0
before merge
Merge branch 'master' of github.com:mozilla/butter
Merge branch 'master' of github.com:bl4de/butter