-config fixed
Merge branch 'master' of github.com:denisarius/petromarkers

Conflicts:
	_config.php
- admin cahnges
Merge branch 'master' of github.com:denisarius/petromarkers
-db backup
- cluster map created
- cluster map small changes
- changes 05.18