Updated rules
Merge remote-tracking branch 'fykos/master'

Conflicts:
	app/FrontendModule/templates/Default/rules.cs.phtml
	app/FrontendModule/templates/Default/rules.en.phtml
Merge remote-tracking branch 'origin/master'