day 7 - before sync with jon
Merge branch 'master' into john

Conflicts:
	iterationone/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	iterationone/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb

iterationone/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll

iterationone/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
.mdb
	iterationone/Library/ScriptAssemblies/Assembly-UnityScript.dll
	iterationone/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	iterationone/Library/assetDatabase3
	iterationone/Library/guidmapper
	iterationone/iterationone-csharp.sln
	iterationone/iterationone.sln