update
update
Merge branch 'master' of github.com:rmrevin/plater

Conflicts:
	muzey-segodnya/virtualnye-ekskursii/auto/index.php
	muzey-segodnya/virtualnye-ekskursii/lunohod/index.php