setup files
Merge branch 'master' of https://github.com/JoabMendes/peteka

Conflicts:
	department/templates/department/details.html
	department/urls.pyc
	department/views.pyc