Merge branch 'Kitten'
added map
add layout and misc features
fixed menu text and logo
Resized image
Merge branch 'feature'
Merge branch 'master' into Kitten