+ ��Ӱ�ȫ�����jsp
Merge branch 'genertecMobile2' of https://github.com/finalljx/viewhome into genertecMobile2
* ��ʱ�޸����Ÿ�������
* �޸�ͼƬ�����б����û�δ��¼������޷�����ͼƬ
Merge branch 'genertecMobile2' of https://github.com/finalljx/viewhome into genertecMobile2

Conflicts:
	html/news/newsDetail.html
	viewers.xml