nhi commit after giang commit jasper
Merge branch 'master' of https://github.com/vtynhi2001/webapp

Conflicts:
	BestBuy/src/main/java/com/bestbuy/app/AdminController.java
	BestBuy/src/main/webapp/WEB-INF/views/temp/content.jsp
	BestBuy/src/main/webapp/resources/styles/div_css.css
	BestBuy/target/classes/com/bestbuy/app/AdminController.class
	BestBuy/target/m2e-wtp/web-resources/META-INF/maven/com.bestbuy/app/pom.properties