Tags: caimi/Crafty

Merge branch 'develop' into testing

Conflicts:
	Gruntfile.js
	src/drawing.js
	tests/core.html
	tests/stage.html

Merge branch 'testing' into release

Merge branch 'testing' into release

Bump version to 0.6.0

(cherry picked from commit fbcdcc2)

Merge pull request craftyjs#592 from pawurb/smoothier_collisions

Gravity collision detected only on top.

Merge pull request craftyjs#525 from starwed/viewport-cleaner

Viewport refactoring (round 1)

Merge pull request craftyjs#509 from starwed/fix-test

Fix global in test 'remove'

Bump version