Android 4.0.1
Merge branch 'master' of https://github.com/bruceyou/NewsBlur

Conflicts:
	templates/static/android.xhtml