Merge pull request #6 from AppGroup/master

icons+maps
map change icons

setting the appropriate icons depending on foodtype