функционал для модальных окон
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/modules/user/views/scripts/layout.phtml
	assets/js/site/default.js