首页id问题
一些修改
Merge branch 'master' of https://github.com/zhangzhige/Museum

Conflicts:
	src/com/waltz3d/museum/DetailActivity.java
	src/com/waltz3d/museum/HomeFragment.java
3D功能实现