Merge branch 'develop'
begin of refactoring
Fixed user
Added layout
Layout added
Rotator fixed
Merge branch 'Refactoring' into develop