peizhi
Merge branch 'develop' of https://github.com/jeissie/MakeMoney into develop

Conflicts:
	.metadata/.plugins/org.eclipse.core.resources/.projects/MakeMoney/.indexes/8e/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MakeMoney/.indexes/a0/5f/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MakeMoney/.indexes/a0/d6/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MakeMoney/.indexes/a0/d6/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MakeMoney/.indexes/a0/de/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MakeMoney/.indexes/a0/de/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MakeMoney/.indexes/e4/81/ea/53/63/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MakeMoney/.indexes/e4/81/ea/53/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MakeMoney/.indexes/e4/81/ea/92/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MakeMoney/.indexes/e4/81/ea/b0/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MakeMoney/.indexes/e4/81/ea/fb/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MakeMoney/.indexes/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MakeMoney/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MakeMoney/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/MakeMoney/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/android_SlidingMenu_WangYiTest/.indexes/a0/d6/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/android_SlidingMenu_WangYiTest/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/android_SlidingMenu_WangYiTest/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/library/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/library/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/library/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.jdt.core/267663701.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	MakeMoney/bin/MakeMoney.apk
	MakeMoney/bin/classes.dex
	MakeMoney/bin/resources.ap_
Merge branch 'develop' of https://github.com/jeissie/MakeMoney into develop

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.history/18/809c203aab7500131c25bcb99f1c6825
	.metadata/.plugins/org.eclipse.core.resources/.history/34/70b3cb77ac7500131c25bcb99f1c6825
	.metadata/.plugins/org.eclipse.core.resources/.history/3b/209fcb4bab7500131c25bcb99f1c6825
	.metadata/.plugins/org.eclipse.core.resources/.history/3f/806bfd1aab7500131c25bcb99f1c6825
	.metadata/.plugins/org.eclipse.core.resources/.history/41/b0886767ac7500131c25bcb99f1c6825
	.metadata/.plugins/org.eclipse.core.resources/.history/7f/b0cf6d2fab7500131c25bcb99f1c6825
	.metadata/.plugins/org.eclipse.core.resources/.history/a/20f8c735a87500131c25bcb99f1c6825
	.metadata/.plugins/org.eclipse.core.resources/.history/a8/a02d0dbbaa7500131c25bcb99f1c6825
	.metadata/.plugins/org.eclipse.core.resources/.history/b9/70fc6e0aab7500131c25bcb99f1c6825
	.metadata/.plugins/org.eclipse.core.resources/.history/d5/105bf565ac7500131c25bcb99f1c6825
	.metadata/.plugins/org.eclipse.core.resources/.history/e0/d0ac3550a77500131c25bcb99f1c6825
	.metadata/.plugins/org.eclipse.core.resources/.projects/MakeMoney/.indexes/a0/5f/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MakeMoney/.indexes/a0/62/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/MakeMoney/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/android_SlidingMenu_WangYiTest/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/android_SlidingMenu_WangYiTest/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/library/.markers
	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.root/12.tree
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/2040064081.index
	.metadata/.plugins/org.eclipse.jdt.core/2119075206.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	MakeMoney/bin/MakeMoney.apk
	MakeMoney/bin/R.txt
	MakeMoney/bin/classes.dex
	MakeMoney/bin/classes/com/jeremyfeinstein/slidingmenu/lib/R$id.class
	MakeMoney/bin/classes/com/jeremyfeinstein/slidingmenu/lib/R$layout.class
	MakeMoney/bin/classes/com/jesse/fragment/FrameHome$1.class
	MakeMoney/bin/classes/com/jesse/fragment/FrameHome.class
	MakeMoney/bin/classes/com/jesse/gallery/PageAdapter.class
	MakeMoney/bin/classes/com/jesse/makemoney/MainActivity.class
	MakeMoney/bin/classes/com/jesse/makemoney/R$drawable.class
	MakeMoney/bin/classes/com/jesse/makemoney/R$id.class
	MakeMoney/bin/classes/com/jesse/makemoney/R$integer.class
	MakeMoney/bin/classes/com/jesse/makemoney/R$layout.class
	MakeMoney/bin/classes/com/jesse/makemoney/R$menu.class
	MakeMoney/bin/classes/com/jesse/makemoney/R$string.class
	MakeMoney/bin/classes/com/jesse/makemoney/R$style.class
	MakeMoney/bin/classes/com/jesse/makemoney/R$styleable.class
	MakeMoney/bin/dexedLibs/library-21a09b37c23ac4a744ac49a99aeb99f0.jar
	MakeMoney/bin/resources.ap_
	MakeMoney/gen/com/jeremyfeinstein/slidingmenu/lib/R.java
	MakeMoney/gen/com/jesse/makemoney/R.java
	MakeMoney/res/menu/loading_page.xml
	MakeMoney/src/com/jesse/makemoney/MainActivity.java