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

Conflicts:
	backend/app/views/general.py