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
Merge branch 'master' into multi-scene-refactor

Conflicts:
	app/src/info/guardianproject/mrapp/HomeActivity.java
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
get rid of hard coded 0 when accessing scene
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
fix bug where AddClipsFragment was treating mTemplate.getScenes() if they were clips.  --> this might be the cause of the export bug
get rid of hard coded 0 when accessing scene
cleanup mathod and var names
StoryTemplateActivity loads template stories now; StoryNewActivity creates templates stories (with dummy template hardcoded for now)
Merge branch 'multi-scene-refactor' of github.com:guardianproject/mrapp into multi-scene-refactor
set project_index on scenes when creating new template project; fix count bug that stopped detection of multi scene projects when loading;
add missing fgrament classes
return to Template Story activity when hitting the 3rd tab in scene editor
add description to scene template
clicking a scene in template story editor now loads appropriate scene editor