Basic sprite sheet animations
Time
Merge remote-tracking branch 'origin/master' into sprite_sheet_animations

Conflicts:
	service.py
Merge remote-tracking branch 'origin/master' into sprite_sheet_animations

Conflicts:
	service.py
Merge pull request #2 from graham/sprite_sheet_animations

Sprite sheet animations