Adding the layout related to bug 1046836
Merge branch 'master' of https://github.com/iGormilhit/gaia