Alan changes

not a lot
Merge branch 'master' of https://github.com/AlanOctavius/DaveCon2K14

Conflicts:
	DaveCon/DaveCon.userprefs
	DaveCon/DaveCon_Data/output_log.txt
	DaveCon/Library/CurrentLayout.dwlt
	DaveCon/Library/CurrentMaximizeLayout.dwlt
	DaveCon/Library/InspectorExpandedItems.asset
	DaveCon/Library/ScriptAssemblies/Assembly-CSharp.dll
	DaveCon/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	DaveCon/Library/assetDatabase3
	DaveCon/Library/guidmapper
	DaveCon/ProjectSettings/TagManager.asset
catching up
Merge branch 'master' of https://github.com/AlanOctavius/DaveCon2K14

Conflicts:
	DaveCon/DaveCon_Data/output_log.txt
	DaveCon/Library/CurrentLayout.dwlt
	DaveCon/Library/ScriptAssemblies/Assembly-CSharp.dll
	DaveCon/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	DaveCon/Library/assetDatabase3
	DaveCon/Library/metadata/c7/c72a62d8861a8a8489284089d314a3f5