ip
Merge branch 'genertecMobile' of https://github.com/finalljx/viewhome into genertecMobile

Conflicts:
	config/web/config.js
	html/home.html