Fix insertRule bug
Fixed fsbutton valign
Using theirs

Merge branch 'master' into alpha

Conflicts:
	public/css/map.css