Rough camera control
Merge remote-tracking branch 'origin/master'

Conflicts:
	Library/assetDatabase3
	Library/guidmapper
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 54b5171b8c52e27df2a624106e5d48e680500e96.