Sprites and lake work
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/states/preload_state.js