m
Merge branch 'master' of git@github.com:spinos/aphid

Conflicts:
	shared/BaseScene.cpp
w cache p
r cache wp
bake frame