Chinh sua lai giao dien
Merge remote-tracking branch 'origin/master'

Conflicts:
	Elevator(20-10)/Elevator/WebContent/Addproduct.xhtml
	Elevator(20-10)/Elevator/WebContent/MasterPage.xhtml
	Elevator(20-10)/Elevator/build/classes/.gitignore