1commit develop
change map
add 2 files
change index.php
Merge pull request #1 from tirilo555/taras

Taras
Merge branch 'develop'

Conflicts:
	index.html