Adding grunt framework and unit testing framework.
Merge branch 'master' into initUnitTesting

Conflicts:
	bin/setup_osx
	package.json
Merge branch 'initUnitTesting'