add my favicon
add icon
add icon
suck
add icon
Merge branches 'develop' and 'master'