fix9a
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/base.css
	css/list.css
	css/theme.css
	index.html
	js/splashscreen.js