slidingmenutest modified in pc
left menu framework ok
okMerge branch 'master' of https://github.com/duguteng/workspace

Conflicts:
	OldFriend/res/values/strings.xml
	SlidingMenuTest/SlidingMenuTest/src/com/example/slidingmenutest/MainActivity.java