Renamed project from math2 to mathjs
Merge branch 'master' into develop

Conflicts:
	README.md
	package.json