update to nicolas version
Merge branch 'master' of https://github.com/Miasma87/tvos

Conflicts:
	FenCodeGenere.cpp
	main.cpp
	player.cpp
	player.pro
	player.pro.user
	qxsrexample.ui