blade admin
Merge branch 'master' of https://github.com/emillionchandra/drive_L

Conflicts:
	ecommerce/app/controllers/HomeController.php