d

d
sds

sd
f

f
d

d
Merge branch 'master' of https://github.com/kennyvanpaemel/maiv_jackinthebox

Conflicts:
	api/restapi.php
	classes/Config.php
	dao/BurgersDAO.php
	dao/QRCodesDAO.php