start of new editor tests
reset to srt test file
Update integration repo.
Merge branch 'staging' of git://github.com/pculture/unisubs into wd-editor-1
Merge branch 'production' into staging

Conflicts:
	optional/unisubs-integration
Update integration repo.
adding some more updates for the editor tests
minor test cleanup - remove screenshots
Merge branch 'staging' of git://github.com/pculture/unisubs into wd-editor-1
a few more tests for editor
Merge pull request #192 from jdragojevic/wd-editor-1

start of selenium tests for the new editor