custom view group
Merge branch 'master' of https://github.com/airshiplay/android

Conflicts:
	android-framework/AndroidManifest.xml
	android-framework/src/com/airshiplay/framework/example/CustomViewGroup.java