ticket:7 Fix test
ticket:7 Merge branch t7-calendar
Merge branch 'master' of github.com:macruss/42TestAngular