fixes

Conflicts:
	public/css/mobile.css
	public/css/style.css
merge
merge