Merge remote-tracking branch 'origin/master'

author Jan Szejko <j-sz@o2.pl>

Wed, 16 Mar 2016 14:58:43 +0000 (15:58 +0100)

committer Jan Szejko <j-sz@o2.pl>

Wed, 16 Mar 2016 14:58:43 +0000 (15:58 +0100)
author Jan Szejko <j-sz@o2.pl>
Wed, 16 Mar 2016 14:58:43 +0000 (15:58 +0100)
committer Jan Szejko <j-sz@o2.pl>
Wed, 16 Mar 2016 14:58:43 +0000 (15:58 +0100)
diff --cc apps/catalogue/templates/catalogue/base.html
Simple merge
author	Jan Szejko <j-sz@o2.pl>
	Wed, 16 Mar 2016 14:58:43 +0000 (15:58 +0100)
committer	Jan Szejko <j-sz@o2.pl>
	Wed, 16 Mar 2016 14:58:43 +0000 (15:58 +0100)