Merge remote-tracking branch 'xnta/test' into test
To issue #480 fixed
Vu calendar test fixed
merge commiit
Merge pull request #483 from AnnaStorozhenko/test

To issue #480