Changes made by Minh Nguyen (truyennhanvk08@gmail.com).
Merge branch 'master' of https://github.com/tung-nguyen7691/EziMobile.git

Conflicts:
	EziMobile/views/orderReview.html
Merge branch 'master' of https://github.com/tung-nguyen7691/EziMobile.git
Changes made by Minh Nguyen (truyennhanvk08@gmail.com).
Merge branch 'master' of https://github.com/tung-nguyen7691/EziMobile.git

Conflicts:
	EziMobile/views/orderReview.html