format changed
Merge branch 'userguide' into home-page-iris
caledar
calendar updates
Merge branch 'userguide' into home-page-iris
samples in homepage
fixed conflict