Features 4480 2

Версия на базе develop, доработанная [] merge with develop and changes maded by konstantin.kukharenko; [] fixed bugs due devtesting;