Password con hash
Login on hash
Merge branch 'master' of https://github.com/l30bravo/tucomic

Conflicts:
	protected/config/main.php