naveesh commit
Merge branch 'master' of https://github.com/unirad/multimedia

Conflicts:
	.metadata/.plugins/org.eclipse.debug.core/.launches/Player.launch
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/607844293.index
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/1.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/2.png
	Unirad/bin/Player$1.class
	Unirad/src/Player.java