Removed installable node_modules
Merge branch 'master' of github.com:Mindspace/Desk-Quizzler

Conflicts:
	tools/webserver/.node_modules/.svn/all-wcprops
	tools/webserver/.node_modules/.svn/entries
	tools/webserver/.node_modules/.svn/text-base/httpServers.coffee.svn-base