change from HelveticaCYPlain to Helvetica
Merge branch 'master' into 185-helvetica-accent

Conflicts:
	app/Joker/Joker.pro
	tests/GraphicStripSyncTest/GraphicStripSyncTest.pro
	tests/GraphicStripTest/GraphicStripTest.pro
	tests/GraphicTest/GraphicTest.pro
	tests/VideoStripTest/VideoStripTest.pro
	tests/VideoSyncTest/VideoSyncTest.pro
	tests/VideoTest/VideoTest.pro
clean [ci-skpi]
change loop label size
change drawTest output size
Merge remote-tracking branch 'origin/master' into 185-helvetica-accent

Conflicts:
	data/img/drawTest.expected.bmp
	tests/AutoTest/GraphicStripTest.cpp
Merge remote-tracking branch 'origin/master' into 185-helvetica-accent
disable background texture in drawTest
Merge branch '185-helvetica-accent' of https://github.com/Phonations/Joker into mdMMC
Merge branch 'master' into mdHelvetica
Merge branch 'master' into mdHelvetica

Conflicts:
	data/img/drawTest.expected.bmp
	tests/AutoTest/GraphicStripTest.cpp
restore background
use travis drawTest.result.bmp
_pFormatContext => _formatContext [ci skip]
increase waiting time for midi test
Merge branch 'master' into mdHelvetica

Conflicts:
	tests/AutoTest/GraphicStripTest.cpp
Merge pull request #263 from Phonations/mdHelvetica

Md helvetica