Merge branch 'master' of C:\dev\devdays with conflicts.
logo
commit to code
logo_new
logo_new_mini
logo_new+
Merge remote-tracking branch 'origin/master'