Merge branch 'debug' into dev

* debug:
  Create debug controller

Conflicts:
	phpunit.xml

Add Debug Controller. Some refactorring