Merge remote-tracking branch 'dd/master'

Res. Conflicts:
	js/custom.js
Merge remote-tracking branch 'karol/master'
Merge remote-tracking branch 'damian/master'
Quizz: Add categories