Merge branch '#14-Button-and-Label'
Merge branch '#14-Button-and-Label'
fix Favicon
Merge branch 'master'