WIP
Merge branch 'develop' into feature/stylist-thank-shop

Conflicts:
	tangthuvien/static/js/foot_define.js
	tangthuvien/templates/_js_defined_params.phtml
	tangthuvien/templates/_top_nav.phtml
	thankshop/admin/__init__.py
	thankshop/static/js/thankshop/inventory.js
	thankshop/templates/thankshop/inventory.phtml
	thankshop/urls.py
Merge branch 'feature/stylist-thank-shop' of github.com:squallcs12/tangthuvien into feature/stylist-thank-shop

Conflicts:
	tangthuvien/templates/_js_defined_params.phtml
	tangthuvien/templatetags/static_tags.py
	thankshop/admin/__init__.py
	thankshop/static/js/thankshop/inventory.js
	thankshop/templates/thankshop/shop_homepage.phtml
	thankshop/urls.py
finish test suitde for read book feature
finish thank shop testing