Costam
Merge branch 'master' of github.com:WPiotr/eWyborySzkieletory

Conflicts:
	MainApp/views.py
Wyswietlanie aktywnych
Merge branch 'master' of github.com:WPiotr/eWyborySzkieletory