commit changes
Merge branch 'master' of https://github.com/ivphpan/brcms

Conflicts:
	protected/modules/order/views/default/index.php