fixed EF problem (I think)
Merge branch 'master' of github.com:mjeaton/GCMediaManager