pulling
fixed conflict
Spelling error in editor when there are no clips/photos in your editor
checkboxes are no longer available if there is no current user
Merge pull request #152 from dbcfoxes2014/debug

Debug