why
Merge branch 'master' of https://github.com/jcslaa/Catch-Player

Conflicts:
	MainActivity/bin/classes/com/ffmpegtest/VideoActivity.class