Merge branch 'develop' of github.com:MarcAntoine-Arnaud/avTranscoder into develop

Conflicts:
	app/SConscript
Merge branch 'develop'

Conflicts:
	app/SConscript