basic spriting with glue.
Merge branch 'develop' into feature/glue

Conflicts:
	Gruntfile.js