Merge branch 'Bettermap'
Merge branch 'Bettermap'
Removed YAML, removed sample layout
Merge branch 'Bettermap'
Merge branch 'Bettermap' into 1.2
Removed unused files
Solve naming problem step 1
solve naming problem step ii
Merge branch 'master' into Bettermap
Merge branch 'Bettermap' into 1.2