smazal jsem log alesovi a pridal fix na qtranslate
Merge origin/master
Merge origin/master
Merge origin/master

Conflicts:
	.htaccess