.
Merge branch 'master' of https://github.com/SGA-SYSTEM/sgasystem

Conflicts:
	sistema_sga/core/models.py
	sistema_sga/core/views.py
	sistema_sga/settings.py
ok
messages