pending, error, and success handling for uploading flip completed
merged
fixed buggy no clip show error
Pulling latest merge in master and merging with changes added to  upload handling
Merge branch 'master' of https://github.com/red-admirals-2014/Stage-Fright into swipe-merge-upload-handling
merged with most current swipe add on
Merge pull request #59 from red-admirals-2014/swipe-merge-upload-handling

Swipe merge upload handling
fixed merge conflict with dan
removed a view test that kept breaking everything