Merge changes made during deployment of szkopul.edu.pl