version 2.0.0
Test
123
Merge branch 'master' of https://github.com/wade790720/iSchool_Principal

Conflicts:
	Android workspce_ischool2/.metadata/.log
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.cdt.core/.log
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.core.resources/.projects/IschoolOAuth2/.indexes/properties.index
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.core.resources/.projects/IschoolOAuth2/.markers.snap
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.core.resources/.projects/IschoolOAuth2/.syncinfo.snap
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.core.resources/.projects/Ischool_Principal/.indexes/a0/5f/properties.index
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.core.resources/.projects/Ischool_Principal/.indexes/a0/d6/properties.index
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.core.resources/.projects/Ischool_Principal/.indexes/a0/de/properties.index
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.core.resources/.projects/Ischool_Principal/.indexes/properties.index
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.core.resources/.projects/Ischool_Principal/.markers.snap
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.core.resources/.projects/Ischool_Principal/.syncinfo.snap
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.core.resources/.snap
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.cdt.debug.core.prefs
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.jdt.core/1542256292.index
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.jdt.core/1626705622.index
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.jdt.core/2165448471.index
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.jdt.core/2256154401.index
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.jdt.core/3801052908.index
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.jdt.core/3865478312.index
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.jdt.launching/.install.xml
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/0.png
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/1.png
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/2.png
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/4.png
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/5.png
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/6.png
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/7.png
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/8.png
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	Android workspce_ischool2/.metadata/.plugins/org.eclipse.wst.xml.core/system_catalog.xml
	Android workspce_ischool2/IschoolOAuth2/bin/ischooloauth2.jar
	Android workspce_ischool2/Ischool_Principal/bin/Ischool_Principal.apk
	Android workspce_ischool2/Ischool_Principal/bin/R.txt
	Android workspce_ischool2/Ischool_Principal/bin/classes.dex
	Android workspce_ischool2/Ischool_Principal/bin/classes/com/ischool/ischool_principal/MainActivity$1.class
	Android workspce_ischool2/Ischool_Principal/bin/classes/com/ischool/ischool_principal/MainActivity$2.class
	Android workspce_ischool2/Ischool_Principal/bin/classes/com/ischool/ischool_principal/MainActivity$3.class
	Android workspce_ischool2/Ischool_Principal/bin/classes/com/ischool/ischool_principal/MainActivity$DrawerItemAdapter.class
	Android workspce_ischool2/Ischool_Principal/bin/classes/com/ischool/ischool_principal/MainActivity$DrawerItemClickListener.class
	Android workspce_ischool2/Ischool_Principal/bin/classes/com/ischool/ischool_principal/MainActivity$SyncData.class
	Android workspce_ischool2/Ischool_Principal/bin/classes/com/ischool/ischool_principal/MainActivity.class
	Android workspce_ischool2/Ischool_Principal/bin/classes/com/ischool/ischool_principal/R$layout.class
	Android workspce_ischool2/Ischool_Principal/bin/classes/com/ischool/ischool_principal/R$menu.class
	Android workspce_ischool2/Ischool_Principal/bin/classes/com/ischool/ischool_principal/R$string.class
	Android workspce_ischool2/Ischool_Principal/bin/classes/com/ischool/ischool_principal/R$style.class
	Android workspce_ischool2/Ischool_Principal/bin/classes/com/ischool/ischool_principal/StudentDetailActivity.class
	Android workspce_ischool2/Ischool_Principal/bin/classes/com/ischool/ischool_principal/StudentFragment$1.class
	Android workspce_ischool2/Ischool_Principal/bin/classes/com/ischool/ischool_principal/StudentFragment$2.class
	Android workspce_ischool2/Ischool_Principal/bin/classes/com/ischool/ischool_principal/StudentFragment$MyAdapter.class
	Android workspce_ischool2/Ischool_Principal/bin/classes/com/ischool/ischool_principal/StudentFragment.class
	Android workspce_ischool2/Ischool_Principal/bin/classes/com/ischool/ischool_principal/TeacherFragment.class
	Android workspce_ischool2/Ischool_Principal/bin/classes/com/ischool/ischool_principal/dal/AddressParser.class
	Android workspce_ischool2/Ischool_Principal/bin/classes/com/ischool/ischool_principal/dal/StudentInfo.class
	Android workspce_ischool2/Ischool_Principal/bin/classes/tw/com/ischool/oauth2/R$layout.class
	Android workspce_ischool2/Ischool_Principal/bin/jarlist.cache
	Android workspce_ischool2/Ischool_Principal/bin/resources.ap_
	Android workspce_ischool2/Ischool_Principal/gen/com/ischool/ischool_principal/R.java
	Android workspce_ischool2/Ischool_Principal/gen/tw/com/ischool/oauth2/R.java
	Android workspce_ischool2/Ischool_Principal/res/values/strings.xml
	Android workspce_ischool2/Ischool_Principal/res/values/styles.xml
	Android workspce_ischool2/Ischool_Principal/src/com/ischool/ischool_principal/MainActivity.java
	Android workspce_ischool2/Ischool_Principal/src/com/ischool/ischool_principal/StudentDetailActivity.java
	Android workspce_ischool2/Ischool_Principal/src/com/ischool/ischool_principal/StudentFragment.java
	Android workspce_ischool2/Ischool_Principal/src/com/ischool/ischool_principal/dal/AddressParser.java
	Android workspce_ischool2/Ischool_Principal/src/com/ischool/ischool_principal/dal/StudentInfo.java