Правка футера
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/modules/yupe/views/assets/css/styles.css