Merge branch 'master' into novacek/paragraph-section

# Conflicts:
#	ctufit-thesis.cls

ctufit-thesis.cls

@@ -263,7 +263,6 @@
 {}
 {}
- 
 % \makeatletter
 \@openrightfalse
 % \makeatother
@@ -525,6 +524,7 @@
 	}{}%
 	\@ifpackageloaded{minted}{%
 		\DeclareRobustCommand{\listingscaption}{\thectufitlistinglabel}%
+        		\SetupFloatingEnvironment{listing}{name=\listingscaption}
 		\DeclareRobustCommand{\listoflistingscaption}{\thectufitlollabel}%
 		\DeclareRobustCommand{\listlistingname}{\thectufitlollabel}%
 		\DeclareRobustCommand{\thectufitlistingscommand}{\listoflistings}%