pre-merge
Merge branch 'develop' of http://github.com/jrsescon/affectdda2 into develop

Conflicts:
	Assets/Scenes/Uno.unity
	Library/CurrentMaximizeLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
Few things. Nothing important.
Fixed some things. Nothing important.
Added metas. Nothing important.
Added baseliner.