zmiany zmiany zmiany
Merge https://github.com/MontJamesmont/kopana into stefan

Conflicts:
	kopana/urls.py
	main/forms.py
	main/views.py