Edit task update

Edit task update
Merge branch 'master' of https://github.com/JoabMendes/peteka

Conflicts:
	department/models.pyc
	department/urls.pyc
	department/views.pyc
	peteka/settings.pyc