push 1
push2
push3
push4
push5
push 6
push6
push7
push8
Merge remote-tracking branch 'origin/master'

Conflicts:
	trunk/Library/CurrentLayout.dwlt
	trunk/Library/assetDatabase3
	trunk/Library/guidmapper
	trunk/Library/metadata/66/66ca564759a60434ab72f69aba1b32fe
	trunk/Library/metadata/cb/cbbba77e9cf913c438d25a90c88adf92