Changed parsing method and adding parsing tests.
Merge branch 'master' of https://github.com/antoyo/ces.js

Conflicts:
	TODO