主菜单采用自定义Adapter
Merge branch 'develop' of https://github.com/HeraldStudio/EzHerald into develop
Signed-off-by: wolfbing <liubing.wolf@gmail.com>
Merge branch 'develop' of https://github.com/HeraldStudio/EzHerald.git into develop
删除无用文件
修复一些文件
增加程序设置以及相关关联，删除StubFrame内容
Merge branch 'develop' of https://github.com/HeraldStudio/EzHerald into develop

Conflicts:
	EzHerald/src/com/herald/ezherald/exercise/ExerciseActivity.java
	EzHerald/src/com/herald/ezherald/exercise/FragmentA.java
	EzHerald/src/com/herald/ezherald/exercise/FragmentB.java
	EzHerald/src/com/herald/ezherald/exercise/RenrenInfo.java
	EzHerald/src/com/herald/ezherald/exercise/RunTimesInfo.java
右侧侧滑菜单更新
ignore
ss
Merge branch 'develop' of https://github.com/HeraldStudio/EzHerald into develop

Conflicts:
	.gitignore
	libABS/bin/classes/com/actionbarsherlock/internal/ActionBarSherlockCompat$ActionModeCallbackWrapper.class
	libABS/bin/classes/com/actionbarsherlock/internal/ActionBarSherlockNative$ActionModeCallbackWrapper.class
	libABS/bin/classes/com/actionbarsherlock/internal/ActionBarSherlockNative$ActionModeWrapper.class
	libABS/bin/classes/com/actionbarsherlock/internal/app/ActionBarImpl$ActionModeImpl.class
	libABS/bin/classes/com/actionbarsherlock/internal/app/ActionBarWrapper$TabWrapper.class
	libABS/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet$AnimatorSetListener.class
	libABS/bin/classes/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet$Builder.class
	libABS/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter$ActionButtonSubmenu.class
	libABS/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter$OpenOverflowRunnable.class
	libABS/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter$OverflowMenuButton.class
	libABS/bin/classes/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter$OverflowPopup.class
	libABS/bin/classes/com/actionbarsherlock/internal/view/menu/MenuPopupHelper$MenuAdapter.class
	libABS/bin/classes/com/actionbarsherlock/internal/widget/IcsProgressBar$RefreshProgressRunnable.class
	libABS/bin/classes/com/actionbarsherlock/internal/widget/IcsSpinner$DropdownPopup.class
	libABS/bin/classes/com/actionbarsherlock/view/MenuInflater$MenuState.class
	libABS/bin/classes/com/actionbarsherlock/widget/ActivityChooserModel$ActivityResolveInfo.class
	libABS/bin/libabs.jar
	libSlidingMenu/bin/libslidingmenu.jar
menu
class
Merge branch 'develop' of https://github.com/HeraldStudio/EzHerald into develop

Conflicts:
	EzHerald/.classpath
fix