add google analytics
add favicon
add favicon and google ananlytics code
Merge branch 'dev'
merge from dev
fix pull conflicts