Merge pull request #15 from MarkInvince/mark

Mark
new commit
new commit
new commit
modified git ignore
change gitignore
before merge
Merge pull request #16 from MarkInvince/romik6

Romik6
working edition
Merge branch 'master' into romik6
Merge pull request #18 from MarkInvince/romik6

Romik6
Merge branch 'master' into mark

Conflicts:
	theme/modules/quotes/classes/QuotesSubmit.php
	theme/modules/quotes/controllers/front/QuotesCart.php
	theme/translations/ru.gzip
	theme/translations/uk.gzip