Favicon Additions
Merge branch 'rsn-favicon-fix' into develop
Merge branch 'develop' of https://github.com/friendlyrick/friendlysite into develop