Market module added
Custom Pages, Products class for routing (not completed yet)
Resolving Conflicts:
	protected/config/main.php
Merge branch 'master' of https://github.com/ivphpan/br-cms

Conflicts:
	protected/config/main.php