Cleaning up!
Merge branch 'master' into Beta
Merge branch 'master' of https://github.com/michalpiekarski/DB-projekt-osrodek into Beta

Conflicts:
	admin/obiekty.php
Merge branch 'master' of https://github.com/michalpiekarski/DB-projekt-osrodek into Beta
Merge branch 'master' of https://github.com/michalpiekarski/DB-projekt-osrodek into Beta