Update timer
Asset database update
Merge branch 'master' of https://github.com/Shadowys/Blitz

Conflicts:
	Library/assetDatabase3