moved cylinder
Merge branch 'master' into maharshi

Conflicts:
	TeamBomboUnity/Library/assetDatabase3