update all
Merge branch 'master' of https://github.com/badman2266/Papa.git

Conflicts:
	workspace/Papago/WebContent/WEB-INF/applicationContext.xml
	workspace/Papago/src/com/cecj03/papago/controller/crud/ChangePwdAction.java
	workspace/Papago/src/com/cecj03/papago/controller/crud/PapaMemAction.java
	workspace/Papago/src/com/cecj03/papago/model/crud/services/PapaMemCrudService.java
	workspace/Papago/src/com/cecj03/papago/model/dao/FavoritesListDao.java
Merge branch 'master' of https://github.com/badman2266/Papa

Conflicts:
	workspace/Papago/WebContent/WEB-INF/applicationContext.xml
	workspace/Papago/build/classes/com/cecj03/papago/controller/crud/PriceTypeServlet.class
	workspace/Papago/src/com/cecj03/papago/controller/crud/PapaMemAction.java
	workspace/Papago/src/com/cecj03/papago/model/crud/services/PapaMemCrudService.java
	workspace/Papago/src/com/cecj03/papago/model/dao/FavoritesListDao.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	workspace/Papago/WebContent/WEB-INF/applicationContext.xml
	workspace/Papago/build/classes/com/cecj03/papago/controller/crud/PriceTypeServlet.class
	workspace/Papago/src/com/cecj03/papago/controller/crud/PapaMemAction.java
	workspace/Papago/src/com/cecj03/papago/model/dao/FavoritesListDao.java
Merge branch 'master' of https://github.com/badman2266/Papa

Conflicts:
	workspace/Papago/build/classes/com/cecj03/papago/controller/crud/PriceTypeServlet.class
Merge branch 'master' of https://github.com/badman2266/Papa.git
papaRec 新增
mege