modified:   .htaccess
	modified:   view/ru/strings.php
	modified:   view/ru/strings.php
Merge branch 'master' of https://github.com/pixelroot/red into pixelroot-master
rev update
Merge https://github.com/friendica/red into pending_merge