Update Java code to 3.x
Merge branch 'master' of https://github.com/macdonst/VideoPlayer

Conflicts:
	plugin.xml