updating OnionKit and android-ffmpeg-java commits
updating commits for OnionKit and AFJ
Fix Bug #991.  Fixed issue with empty clip causing clips to skip.
Merge pull request #29 from micahjlucas/master

Fix Bug #991.  Fixed issue with empty clip causing clips to skip.
Added Colors to Audio Icons. Issue #1033.
Replaced Ambient Icon with correct image. Issue #1033.
Merge pull request #31 from micahjlucas/AudioIcons1033

Audio Icons Issue #1033
update to fully build app via scripts.
update to fully build app via scripts.

Conflicts:
	setup-ant.sh
Merge branch 'master' into HEAD

Conflicts:
	app/src/info/guardianproject/mrapp/model/Media.java
	setup-ant.sh
Fixed bug causing screen-rotation to revert language back to English. Issue #1993