Again some merging to finally upload the common working base
Merge branch 'PrePush'

Conflicts:
	Assets/Assets_Martin/Scripts/pump.js