Vovchik test commit
Merge remote-tracking branch 'upstream/master'
half of a design is done
Merge remote-tracking branch 'upstream/master'
login,reg,forum_index design
conflicts solving
solving conflicts(2)