Vista
Merge branch 'master' of https://github.com/xoco-carlos/WebSecurity

Conflicts:
	php/models/View.php