fix bug where AddClipsFragment was treating mTemplate.getScenes() if they were clips.  --> this might be the cause of the export bug
revet to defaulting to video_simple.json
Merge branch 'multi-scene-refactor' of github.com:guardianproject/mrapp into multi-scene-refactor

Conflicts:
	app/src/info/guardianproject/mrapp/AddClipsFragment.java