test
test
Merge branch 'adminPanel' of https://github.com/ygolecha/dpv2 into adminPanel

Conflicts:
	adminPitara/index.php
tests again
Merge branch 'adminPanel' of https://github.com/ygolecha/dpv2 into adminPanel

Conflicts:
	adminPitara/header.php
	adminPitara/index.php
	adminPitara/templates/footer.tpl
	adminPitara/templates/header.tpl
	adminPitara/templates/index.tpl
removed index.php and header.php