fix Conflicts:
fix conflicts

Merge branch 'master' of github.com:JacobDu/QrPlayer

Conflicts:
	src/main/java/com/kula/qrplayer/interpret/QrCodeInterpreterProvider.java