added location
fixed merge
Merge branch 'master' of github.com:4lbertoC/OOOOh-ackOOOO
merged a lot of icons with search function