imageGrid video
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/albaniliu/chuangxindemo/ui/home/ImageGridActivity.java