Merge branch 'casamaster'
wait linda merge
Merge pull request #23 from comiscienceknight/master

for map menu button merging