before merge
Merge branch 'master' into mark1
Merge pull request #29 from MarkInvince/mark1

Mark1
Merge branch 'master' into romik13

Conflicts:
	theme/modules/quotes/quotes.php