11/10/14
Merge remote-tracking branch 'origin/master'

Conflicts:
	Project3/Library/CurrentLayout.dwlt
	Project3/Library/CurrentMaximizeLayout.dwlt
	Project3/Library/assetDatabase3
	Project3/Library/expandedItems
	Project3/Library/guidmapper
	Project3/Library/metadata/4a/4a9d7cdb304cd934bb2c060e806822a4
	Project3/Project3-csharp.sln
	Project3/Project3.sln