Small fixes for favicon.ico
Remove old patch.
Merge branch 'rails-3-develop' into release/0.16