Fixing merge issue
adding deploy step on SonyTest
Adding a debug log for syncrho
Merge branch 'master' of https://github.com/Phonations/Joker

Conflicts:
	app/Joker/Joker.pro
	app/Joker/MainWindow.cpp