wrzucam znowu bs plus pliki
Merge branch 'develop' of https://github.com/arispen/rc-2 into develop