dario
Merge branch 'master' of github.com:dnascimento/eduze

Conflicts:
	backend/app/templates/admin/index.html
	backend/app/views/libs/db_queries.py
Merge branch 'master' of github.com:dnascimento/eduze