me
www
Merge branch 'trunk' of https://github.com/tinytitan-xx/catchup into trunk

Conflicts:
	test1/.classpath
	test1/src/main/java/org/test1/common/App.java
	test1/src/main/java/org/test1/dao/impl/StockDaoImpl.java
cp
s
cp
useless
adding App.java back