integrating new maps and layout ordering
resolving conflicts on merging the new maps and the layers ordering
Merge pull request #33 from rising-thunder/romain

merging new maps and layer ordering