Full edit.
Merge branch 'master' of https://github.com/Sloth6/Colludo

# By Joel Simon
# Via Joel Simon
* 'master' of https://github.com/Sloth6/Colludo:
  fixed building.

Conflicts:
	app/client/img/cityTiles/rocksold.png
	node_modules/db/node_modules/aws-sdk/scripts/console
	node_modules/db/node_modules/aws-sdk/scripts/coverage
	node_modules/db/node_modules/mysql/lib/query.js
	node_modules/db/node_modules/mysql/node_modules/hashish/node_modules/traverse/examples/json.js
	node_modules/db/node_modules/mysql/node_modules/hashish/node_modules/traverse/examples/leaves.js
	node_modules/db/node_modules/mysql/node_modules/hashish/node_modules/traverse/examples/negative.js
	node_modules/db/node_modules/mysql/node_modules/hashish/node_modules/traverse/examples/scrub.js
	node_modules/db/node_modules/mysql/node_modules/hashish/node_modules/traverse/examples/stringify.js
	node_modules/db/node_modules/mysql/test/run.js
	node_modules/db/node_modules/mysql/tool/pcap-mysql.js
	node_modules/db/node_modules/redis/tests/stress/pubsub/run
	node_modules/db/node_modules/redis/tests/stress/rpushblpop/run
	node_modules/db/node_modules/redis/tests/stress/speed/plot
	node_modules/emailjs/node_modules/moment/lang/fa.js
	node_modules/emailjs/node_modules/moment/test/lang/fa.js
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/config.gypi
	node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/gyp-mac-tool