Got waves placed correctly and added texture mapping
Merge remote-tracking branch 'origin/master'

Conflicts:
	castle-fireworks.js
	castle-ocean.js
	castle-structure.js
	castle.js