various
Merge branch 'master' of https://github.com/Ardnived/ApeMaze

Conflicts:
	client/board.js
Temp collision fix
Merge branch 'master' of https://github.com/Ardnived/ApeMaze

Conflicts:
	client/avatar.js
	client/board.js
	resources/maps/test3.json