Merge branch 'master' of https://github.com/foxmote/foxmote

Conflicts:
	client/gruntFile.js
	client/package.json