修改AddressDAO的get\set方法名
Merge remote-tracking branch 'origin'

Conflicts:
	src/com/funs/address/service/AddressService.java
add .classpath .project