updating OnionKit and android-ffmpeg-java commits
updating commits for OnionKit and AFJ
update setup-ant.sh to use android-17 for build sdk
Fix Bug #991.  Fixed issue with empty clip causing clips to skip.
Updated EULA

Our EULA stilll had place holder hashtags in it. I've updated it.
Added Memory Checking to alert user if memory is too low.  Issue #1796
Added Colors to Audio Icons. Issue #1033.
Replaced Ambient Icon with correct image. Issue #1033.
Fixed high-resolution export bug. Issue #1479
bump version to 0.0.6-beta3-build86
9 New Templates / Adjusted Video Simple Scene

I've replaced the original four templates with nine more specific
tempaltes. I've also adjusted the video simple scene to make the close
up shot first, and to use that for the interview clip.
fixes to get new templates loading
add back deleted legacy templates
updating to use newer audio icons
Removed Trim Button from Photo/Gallery projects.  Issue #1840
Fixed overlapping columns on Make tab.  Issue #1847.
Changed middle tab from Order to Edit. Issue 1932
Added Hack to make Audio Crossfade never equal 0.  Issue #1950
Fixed timing issue causing Audio out of Sync on Export.  Issue #1947.
merge cleanup