modified:   src/main/java/com/flyhz/avengers/template/impl/RecursiveCall.java
	modified:   src/main/java/com/flyhz/avengers/util/AvengersDataUtil.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
Merge branch 'master' of https://github.com/rememberlostcode/flyhz

Conflicts:
	avengers/src/main/java/com/flyhz/avengers/template/impl/RecursiveCall.java

	modified:   avengers/pom.xml
	new file:   avengers/src/main/java/com/flyhz/avengers/framework/core/AvengersConfiguration.java
	modified:   avengers/src/main/java/com/flyhz/avengers/parser/NuaaParser.java
	modified:   avengers/src/main/java/com/flyhz/avengers/template/impl/RecursiveCall.java
	new file:   avengers/src/main/java/com/flyhz/avengers/util/HbaseUtil.java
	new file:   avengers/src/main/resources/applicationContext-core.xml
	new file:   avengers/src/main/resources/avengers.properties
	modified:   avengers/src/main/resources/avengers.xml
	new file:   avengers/src/main/resources/log4j.properties
	deleted:    avengers/src/main/resources/logback.xml
	modified:   smile/pom.xml
	new file:   smile/src/main/java/com/flyhz/framework/util/ExceptionUtil.java
	new file:   smile/src/main/resources/exception.properties
	modified:   smile/src/main/resources/spring/applicationContext-transaction.xml
	modified:   smile_android/src/com/holding/smile/activity/OrderDetailActivity.java
	modified:   smile_android/src/com/holding/smile/activity/WebViewActivity.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
	modified:   project.properties
	modified:   src/com/holding/smile/myview/PullToRefreshView.java