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

Conflicts:
	tangthuvien/templates/_top_nav.phtml
	thankshop/admin/__init__.py
move angularjs to tangthuvien static folder
remove static tags because it can cause problem
replace tab by spaces
WIP