update main config
Merge branch 'master' of https://github.com/mrmb/Time-Earth
Update layout controllers, create an internal layout, create google maps test