started display panel work
Merge branch 'master' of github.com:eior93/maps
Merging!
merging