20140504
Merge branch 'master' of github.com:anqiongdy/androidworkspace

Conflicts:
	Layout/src/com/liqiong/layout/MainActivity.java