include yii
include yii
rename variable
sales
sales
sales
fix layout for login
validation
activate menu
fix purchase
add new style
add new style
Merge origin/master

Conflicts:
	app/views/layouts/sidebar.php
Purchase layout repair
Purchase layout repair
Purchase layout repair
add component
:grinning:
:grinning: