added layouts
Ye's Merge
Merge branch 'staging.branch' of https://github.com/huntercsteam7/capstonexue into staging.branch

Conflicts:
	Xue/gen/com/MeadowEast/xue/R.java
	Xue/res/anim/bottom_to_top_slide.xml
	Xue/res/anim/left_to_righ_slide.xml
	Xue/res/anim/right_to_left_slide.xml
	Xue/src/com/MeadowEast/xue/LearnActivity.java