minhnguyen - add navigator, fix shopping cart
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/Safety/Ultilities/Constant.java
minhnguyen - add constant