update attribute,category,price,product,promotion,review,tax
Merge branch 'master' of https://github.com/raymondchandra/ilu

Conflicts:
	app/models/Price.php