Commiting layout framework
Merge branch 'master' of https://github.com/ckaut/maps-friend-extension