a
Merge branch 'master' of https://github.com/nvquockhtn/BestBuy

Conflicts:
	Source/BestBuy/src/main/webapp/WEB-INF/tiles.xml