Commented out MP4 dialog box because it's really no longer necessary and was causing some people problems apparently
fixed a minor warning in the profiler
Merge remote-tracking branch 'origin/master'