Bug fixes
Merge branch 'database' of https://github.com/nag-motherfuckers/TrovaTreno into database

Conflicts:
	js/app.js