- praca na team detail
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/dataSources.xml
	.idea/workspace.xml
	HrajAirsoft/static/css/layout.css
	database.db