authpage
Merge branch 'master' of https://github.com/idaChile/govtr

Conflicts:
	idagovtr/js/scriptIDA.js
	simplesaml/modules/vtrauth/www/authpage.php