build cleanup
Merge branch 'master' into mac

Conflicts:
	.cproject
	.gitignore
	Debug/objects.mk
	asan/objects.mk