Teste Javascript
Merge branch 'master' of https://github.com/gabrielganem/alvo

Conflicts:
	application/views/scripts/index/index.phtml
	public/js/login.js