9:21
Merge branch 'master' of
https://github.com/Team1982/WebApplicationElements

Conflicts:
	CDRApp1/Dane1.php
	CDRApp1/js/cdrapp.js