pop-up
Merge branch 'master' of github.com:DanilaGegele/flor2u and global update

Conflicts:
	index.php
	js/main.js
	order.php
	template_styles.less