zmiana
Merge branch 'nowosci'

Conflicts:
	subscriptions