Merge pull request #3 from AppGroup/master

map
Map stuff

Transparency+icons