media changes
Merge branch 'master' of github.com:djredhand/video_player
Merge branch 'master' of github.com:djredhand/video_player
Merge branch 'master' of github.com:djredhand/video_player
Merge branch 'master' of github.com:djredhand/video_player
Merge branch 'master' of github.com:djredhand/video_player
Merge branch 'master' of github.com:djredhand/video_player
Merge branch 'master' of github.com:djredhand/video_player
Merge branch 'master' of github.com:djredhand/video_player
Merge branch 'master' of github.com:djredhand/video_player
source change
Merge branch 'master' of github.com:djredhand/video_player