d
Merge branch 'master' of https://github.com/alexdd55/dmpsftbl

Conflicts:
	app/Controller/JsonController.php