Some changes I forget to commit (now I dont remember what the changes was)
Merge branch 'master' of https://github.com/ivanbarlog/MPEG-TS

Conflicts:
	MPEG-TS.pro.user