Added missing generated Manifest.java. Fixed problem with hard-coded path in CollaboRhythm.NativeExtensions.PlayVideo.Android.iml
Merge remote-tracking branch 'origin/master'