fabric

fabric
Merge branch 'dev' of https://github.com/michellehoda/simsam into dev

Conflicts:
	simsam_app/coffee/samlite.coffee
	simsam_app/coffee/sprite.coffee
	simsam_app/js/samlite.js