last update
last update
Merge branch 'develop' into collaboration

Conflicts:
	controllers/testFront.py
	databases/sql.log
	languages/es.py
	views/_index.html