poprawki
Merge branch 'master' of https://github.com/marcinf/php_framework

Conflicts:
	view/logging.php
poprawa repo