LiangYang
Merge origin/master
testing same line
Merge origin/master

Conflicts:
	beans/EntityManagerBean/src/java/entityManagerBean/Customer.java