Working in new solution for video in Mac OS X (partially working).
Merge branch 'java7' into fw6-skin1