new commit
Merge pull request #29 from MarkInvince/mark1

Mark1
Merge branch 'master' into romik13

Conflicts:
	theme/modules/quotes/quotes.php
Merge pull request #30 from MarkInvince/romik13

Romik13
Merge branch 'master' into mark1