Bring back the support for Harmattan style translation in translation catalogs
Bump version
Merge remote-tracking branch 'origin/master' into qt5

Conflicts:
	mlite.pro
Do not use deprecated QString::toAscii()