...
Merge branch 'master' of github.com:gudoy/PHPGasus-v0

Conflicts:
	views/VTests.class.php