update vista
Merge branch 'master' of https://github.com/revivemarketing/ELWeb

Conflicts:
	ELWeb.tmproj
	css/app.css
	css/test.css
	vista.html