Cambios idiomas
Merge branch 'master' of github.com:karlosgliberal/bime

Conflicts:
	public/scripts/app.js