Merge remote-tracking branch 'upstream/dev' into dev

Conflicts:
	.gitignore
Fixed some stuff
Merge branch 'dev' of https://github.com/Nuke928/PonyKart into dev