Fix the wrong fix before.
Merge branch 'master' into homework

Conflicts:
	Gruntfile.js
Browserify client test files.