Signed-off-by: janani <janu.vu@gmail.com>
Merge branch 'master' of https://github.com/yokesh28/arya.git

Conflicts:
	protected/modules/admin/models/Products.php