merge
Merge branch 'version-1'
Merge branch 'master' of ssh://github-iantc/ux45/ca2
Update home page layout