I added main.aspx
Merge remote-tracking branch 'Git/Offir' into Semyon
changed some names and id's