work on horse animation and Word Herder positioning
Merge branch 'refs/heads/alpha'

Conflicts:
	web/css/phone_layout.css
	web/css/tablet_layout.css