apilogs
Merge branch 'master' of https://github.com/pinxli/adminPanel

Conflicts:
	application/cache/smarty/compiled/cd47632de75495303ccb36e4997c6aff058363a8.file.product_add_view.tpl.php