Ciekawe rzeczy generalnie
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/kiwi/controller/Search.java
Ciekawe rzeczy generalnie