test of probable asset database merge
Merge branch 'master' of https://github.com/SadMonk/10seconds

Conflicts:
	Library/assetDatabase3
Merge branch 'master' of https://github.com/SadMonk/10seconds
added granma pic, added game component, that doesn't do much right now.