merge
Merge
Merge branch 'master' of github.com:l30bravo/PIrateValpo

Conflicts:
	web/protected/config/main.php