Merge remote-tracking branch 'remotes/origin/front' into rev16

Conflicts:
	module/Zachetka/view/zachetka/profile/student/lenta.phtml