new commit
Merge branch 'master' into romik13

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

Romik13