Fixing stuff
Merge branch 'dev' of https://github.com/warcode/candy into dev

Conflicts:
	src/core.js