*HP Reg added, working on the moving back to spawn
Merge branch 'paranoid-dev'

Conflicts:
	Unity/Library/CurrentLayout.dwlt
	Unity/Library/assetDatabase3
	Unity/Library/guidmapper
Merge branch 'babucke-dev'