Hroznej bordel
Merge branch 'master' of https://github.com/MMajko/3f

Conflicts:
	img/temp-qrcodegen.png