排票（2014-04-26彭忠泓）
排票初步
Merge branch 'develop' of https://github.com/HeraldStudio/EzHerald into develop

Conflicts:
	.gradle/1.11/taskArtifacts/cache.properties.lock
	.gradle/1.11/taskArtifacts/fileHashes.bin
	.gradle/1.11/taskArtifacts/fileSnapshots.bin
	.gradle/1.11/taskArtifacts/outputFileStates.bin
	.gradle/1.11/taskArtifacts/taskArtifacts.bin
	.idea/encodings.xml
	.idea/gradle.xml
	.idea/libraries/android_support_v4.xml
	.idea/libraries/nineoldandroids_library_2_4_0.xml
	.idea/modules.xml
	.idea/workspace.xml
	EzHerald.iml
	EzHerald/build.gradle
	EzHerald/build/exploded-aar/Ezherald/libABS/unspecified/classes.jar
	EzHerald/build/exploded-aar/Ezherald/libDragNDropList_/unspecified/classes.jar
	EzHerald/build/exploded-aar/Ezherald/libSlidingMenu/unspecified/classes.jar
	EzHerald/build/exploded-aar/Ezherald/libViewFlow/unspecified/classes.jar
	EzHerald/build/incremental/mergeAssets/debug/merger.xml
	EzHerald/build/incremental/mergeResources/debug/merger.xml
	EzHerald/build/manifests/debug/AndroidManifest.xml
	EzHerald/build/pre-dexed/debug/TalkingdataAnalytics-a5004cf8432f8edaea33ba7065dc15c255192c51.jar
	EzHerald/build/pre-dexed/debug/android-support-v4-b869d4750fb97aeb7a9b74e2c373c6e73b527fb7.jar
	EzHerald/build/pre-dexed/debug/classes-06fc2da9638ee0a15c5afe772e48f405ff035da9.jar
	EzHerald/build/pre-dexed/debug/classes-9787b7443cd85dc4a49b5f21628b9ec8fed11a7b.jar
	EzHerald/build/pre-dexed/debug/classes-b66f0646212cfd63a1ed7ae1aa7ac5374d706065.jar
	EzHerald/build/pre-dexed/debug/classes-b7a4b85be03ed721987cb9d74d193b8e5bf16ee0.jar
	EzHerald/build/pre-dexed/debug/herald-authentication-api-1.0.ALPHA3-jar-with-dependencies-045162951dec128cc74535b9c47a8593aae874c4.jar
	EzHerald/build/pre-dexed/debug/herald-web-services-api-1.1-20130830.125040-41-afbf1bba39a7cc1d268e251fa8ff9bb821f25cdb.jar
	EzHerald/build/pre-dexed/debug/jersey-core-1.17.1-3786c905abf2e4a55f1c2aa77de21f1ed18d20f2.jar
	EzHerald/build/pre-dexed/debug/jsoup-1.7.2-41570999d2dc5fcfd1c7820bd56c75979648be07.jar
	EzHerald/build/pre-dexed/debug/wink-common-1.3.0-f94481a99c3ef1d050111ef211ef5ad2ba997d48.jar
	EzHerald/build/res/all/debug/layout/residemenu.xml
	EzHerald/build/res/all/debug/layout/residemenu_item.xml
	EzHerald/build/source/r/debug/com/herald/ezherald/R.java
	EzHerald/build/source/r/debug/com/jeremyfeinstein/slidingmenu/lib/R.java
	EzHerald/build/source/r/debug/com/special/ResideMenu/R.java
	EzHerald/build/symbols/debug/R.txt
	EzHerald/src/com/herald/ezherald/BaseFrameActivity.java
	EzHerald/src/com/herald/ezherald/MainActivity.java
	import-summary.txt
	libABS/build/bundles/release/classes.jar
	libABS/build/libs/libABS.aar
	libDragNDropList_/build/bundles/release/classes.jar
	libDragNDropList_/build/exploded-aar/Ezherald/libABS/unspecified/classes.jar
	libDragNDropList_/build/libs/libDragNDropList_.aar
	libSlidingMenu/build/bundles/release/classes.jar
	libSlidingMenu/build/exploded-aar/Ezherald/libABS/unspecified/classes.jar
	libSlidingMenu/build/libs/libSlidingMenu.aar
	libViewFlow/build/bundles/release/classes.jar
	libViewFlow/build/libs/libViewFlow.aar
	settings.gradle